![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Mar 2009 23:41:39 +0000 (15:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Mar 2009 23:41:39 +0000 (15:41 -0800) | ||
| commit | 2e2e91d6b27f522707322835a1f8c4a5e18a2419 | |
| tree | 34e2d38440f0b773408490d0bf793fd91119b20c | tree | snapshot |
| parent | 229e65823afca5151afa44f7d3978926b2b1b2b7 | commit | diff |
| parent | 1d398a03902aab8ec49197d8827c19f9e2203c98 | commit | diff |
Merge branch 'dm/add-i-edit-abort'
* dm/add-i-edit-abort:
add -i: revisit hunk on editor failure
* dm/add-i-edit-abort:
add -i: revisit hunk on editor failure