rerere: understand "diff3 -m" style conflicts with the original
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Aug 2008 17:24:45 +0000 (10:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 02:41:43 +0000 (19:41 -0700)
commit387c9d4...815ef4b1cefda71cf27f199d9fb24083
treea3ff973...4c0acbc7776ee4264a9d05bf3d820f9fcopy hash to clipboard (tree)
parentcc58d7d...ddc842360f6aade1507e1063d8cd0f40copy hash to clipboard (diff)
rerere.c