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)
commita505f62f6f1ebdacab075f1ce52f949f33f7450f
tree15a7b6515c534aabc322a3342d304ef5ba72c02c
parent8293ee0554a0b012b3e7667e419cbb33d5fee7b6
parent604a64641d874b0f00f1d1371f25be177972bcf2
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
Makefile