add tests for merge-index / merge-one-file
authorJeff King <peff@peff.net>
Fri, 29 Apr 2011 22:23:54 +0000 (18:23 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2011 22:37:08 +0000 (15:37 -0700)
commitcf1af1b...f3ddd2554f64aae120635952801a9632
tree87d8f16...6565764f3822afdc6889fcee22d0d2b7copy hash to clipboard (tree)
parent547e8b9...05349b47003ed25a82673e413e71c255copy hash to clipboard (diff)
t/t6060-merge-index.sh [new file with mode: 0755]