Merge branch 'jc/make-dedup-ls-files-output'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2019 14:50:33 +0000 (23:50 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2019 14:50:33 +0000 (23:50 +0900)
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

1  2 
Makefile
diff --cc Makefile
Simple merge