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)
commit2e2e91d6b27f522707322835a1f8c4a5e18a2419
tree34e2d38440f0b773408490d0bf793fd91119b20c
parent229e65823afca5151afa44f7d3978926b2b1b2b7
parent1d398a03902aab8ec49197d8827c19f9e2203c98
Merge branch 'dm/add-i-edit-abort'

* dm/add-i-edit-abort:
  add -i: revisit hunk on editor failure