![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Feb 2011 05:58:30 +0000 (21:58 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Feb 2011 05:58:30 +0000 (21:58 -0800) | ||
| commit | 66a6a3142074473c91eb7f11de4d745647d43540 | |
| tree | a532985d98f541d276965d42600362fd372669c5 | tree | snapshot |
| parent | 7d5c884ead4e95cdccb21e8624b49fd6b95f3827 | commit | diff |
| parent | 2f59c947044d535e078941711e562d825eb055e3 | commit | diff |
Merge branch 'mz/rerere-remaining'
* mz/rerere-remaining:
mergetool: don't skip modify/remove conflicts
rerere "remaining"
* mz/rerere-remaining:
mergetool: don't skip modify/remove conflicts
rerere "remaining"