Code

Merge branch 'mz/rerere-remaining'
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000 (21:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000 (21:58 -0800)
* mz/rerere-remaining:
  mergetool: don't skip modify/remove conflicts
  rerere "remaining"


Trivial merge