From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 18:48:54 +0000 (-0700)
Subject: Merge branch 'fc/rerere-conflict-style' into maint
X-Git-Tag: v2.0.1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ada8710e634b4f9f686bd0477bd92b272ec60801;p=thirdparty%2Fgit.git

Merge branch 'fc/rerere-conflict-style' into maint

"git rerere forget" did not work well when merge.conflictstyle
was set to a non-default value.

* fc/rerere-conflict-style:
  rerere: fix for merge.conflictstyle
---

ada8710e634b4f9f686bd0477bd92b272ec60801