Merge branch 'fc/rerere-conflict-style'
* fc/rerere-conflict-style: rerere: fix for merge.conflictstyle
Junio C Hamano committed
Jun 3, 2014 at 12:06 UTC
6d3c4e93d40c3a7fce3c8bdc933feeb74a6b2b08
No changes.
* fc/rerere-conflict-style: rerere: fix for merge.conflictstyle
No changes.