summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-29 23:12:38 -0700
committerJunio C Hamano <gitster@pobox.com>2007-08-29 23:12:38 -0700
commit93e23fea2d7538ac24e35b50984dbbbb84d89f9a (patch)
tree8883596fb446d00073384fc4ada76c5bc570b437 /git-merge-resolve.sh
parent9656153b87d47b34986f2d77eef9199c24cbf9f6 (diff)
downloadgit-93e23fea2d7538ac24e35b50984dbbbb84d89f9a.tar.gz
ls-files --error-unmatch: do not barf if the same pattern is given twice.
This is most visible when you do "git commit Makefile Makefile"; it may be a stupid request, but that is not a reason to fail the command. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions