From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Feb 2011 05:58:30 +0000 (-0800)
Subject: Merge branch 'mz/rerere-remaining'
X-Git-Tag: v1.7.5-rc0~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66a6a3142074473c91eb7f11de4d745647d43540;p=thirdparty%2Fgit.git

Merge branch 'mz/rerere-remaining'

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

66a6a3142074473c91eb7f11de4d745647d43540