t4200: rerere a merge with two identical conflicts
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 21:58:25 +0000 (14:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2016 22:32:19 +0000 (15:32 -0700)
commit82efa6e...7e76ecd0f52a93886bcee1b8e517a662
tree6ad93ae...c8978179b5b8d4b83d56266611f223cdcopy hash to clipboard (tree)
parenta13d137...0b05442855447670d7c3313f99f5da3ccopy hash to clipboard (diff)
t/t4200-rerere.sh