builtin-rerere: more carefully find conflict markers
authorOlivier Marin <dkr@freesurf.fr>
Mon, 7 Jul 2008 12:42:48 +0000 (14:42 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2008 07:17:46 +0000 (00:17 -0700)
commit99d698f...e703754422f1dd780487ddbff3726dc3
tree1524e03...8e58318658e8fdf47c31c667d5bd29c6copy hash to clipboard (tree)
parenta9a3e82...6d0018ff42ec11fd9560c1ff47add824copy hash to clipboard (diff)
builtin-rerere.c
t/t4200-rerere.sh