Merge branch 'dm/add-i-edit-abort'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:41:39 +0000 (15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:41:39 +0000 (15:41 -0800)
* dm/add-i-edit-abort:
add -i: revisit hunk on editor failure

Trivial merge