rebase: show consistent conflict resolution hint
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Sun, 6 Feb 2011 18:43:49 +0000 (13:43 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 22:08:09 +0000 (14:08 -0800)
commit89c7ae9...3bffe599b46a18a9a504fd3e28a9e715
treeb180de0...18d03ced2af1a331770487bf2ef61d5ccopy hash to clipboard (tree)
parent46df82d...fa0f83d3c1108ad70248877d6d9b56bbcopy hash to clipboard (diff)
git-rebase--interactive.sh