Merge branch 'mz/rerere-remaining'
commit66a6a3142074473c91eb7f11de4d745647d43540
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000 (27 21:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000 (27 21:58 -0800)
treea532985d98f541d276965d42600362fd372669c5
parent7d5c884ead4e95cdccb21e8624b49fd6b95f3827
parent2f59c947044d535e078941711e562d825eb055e3
Merge branch 'mz/rerere-remaining'

* mz/rerere-remaining:
  mergetool: don't skip modify/remove conflicts
  rerere "remaining"