| commit | ada8710e634b4f9f686bd0477bd92b272ec60801 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:48:54 +0000 (25 11:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:48:54 +0000 (25 11:48 -0700) | ||
| tree | 858d045b56f90f939064c7bc27fdc2ae7516d66a | treesnapshot (tar.gz zip) |
| parent | 5327207e0fbc442b34e6371c1f28b5ed21aef8a0 | commitdiff |
| parent | de3d8bb7736cafae0ff10e047e2afa994b1dd901 | commitdiff |
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
"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