From: Junio C Hamano Date: Thu, 5 Mar 2009 23:41:39 +0000 (-0800) Subject: Merge branch 'dm/add-i-edit-abort' X-Git-Tag: v1.6.3-rc0~213 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e2e91d6b27f522707322835a1f8c4a5e18a2419;p=git.git Merge branch 'dm/add-i-edit-abort' * dm/add-i-edit-abort: add -i: revisit hunk on editor failure --- 2e2e91d6b27f522707322835a1f8c4a5e18a2419