From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Jun 2014 19:06:45 +0000 (-0700)
Subject: Merge branch 'fc/rerere-conflict-style'
X-Git-Tag: v2.1.0-rc0~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d3c4e93d40c3a7fce3c8bdc933feeb74a6b2b08;p=thirdparty%2Fgit.git

Merge branch 'fc/rerere-conflict-style'

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

6d3c4e93d40c3a7fce3c8bdc933feeb74a6b2b08