rebase--merge: fix --skip with two conflicts in a row
authorbrian m. carlson <sandals@crustytoothpaste.net>
Mon, 16 Jun 2014 00:01:25 +0000 (00:01 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 20:29:16 +0000 (13:29 -0700)
commit95104c7...257652b82aed089494def344e3938928
treeee8b3a0...a8fe7a334a146110fe69ee2328558ce4copy hash to clipboard (tree)
parent34d5217...84ee4722d0c0b07ed6c8f1f01ad157c3copy hash to clipboard (diff)
git-rebase--merge.sh
t/t3402-rebase-merge.sh