From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 May 2019 14:50:33 +0000 (+0900)
Subject: Merge branch 'jc/make-dedup-ls-files-output'
X-Git-Tag: v2.22.0-rc0~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a505f62f6f1ebdacab075f1ce52f949f33f7450f;p=thirdparty%2Fgit.git

Merge branch 'jc/make-dedup-ls-files-output'

A "ls-files" that emulates "find" to enumerate files in the working
tree resulted in duplicated Makefile rules that caused the build to
issue an unnecessary warning during a trial build after merge
conflicts are resolved in working tree *.h files but before the
resolved results are added to the index.  This has been corrected.

* jc/make-dedup-ls-files-output:
  Makefile: dedup list of files obtained from ls-files
---

a505f62f6f1ebdacab075f1ce52f949f33f7450f