| commit | 6d3c4e93d40c3a7fce3c8bdc933feeb74a6b2b08 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jun 2014 19:06:45 +0000 (3 12:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jun 2014 19:06:45 +0000 (3 12:06 -0700) | ||
| tree | bc3d2b2c238b57f89df7b8483e9fa5e369513a8e | treesnapshot (tar.gz zip) |
| parent | 520cd9cd20a97d1220d6f0ebf921406683ad62ee | commitdiff |
| parent | de3d8bb7736cafae0ff10e047e2afa994b1dd901 | commitdiff |
Merge branch 'fc/rerere-conflict-style'
* fc/rerere-conflict-style:
rerere: fix for merge.conflictstyle
* fc/rerere-conflict-style:
rerere: fix for merge.conflictstyle