diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:48:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:48:54 -0700 |
| commit | ada8710e634b4f9f686bd0477bd92b272ec60801 (patch) | |
| tree | 858d045b56f90f939064c7bc27fdc2ae7516d66a /builtin/commit.c | |
| parent | 5327207e0fbc442b34e6371c1f28b5ed21aef8a0 (diff) | |
| parent | de3d8bb7736cafae0ff10e047e2afa994b1dd901 (diff) | |
| download | git-ada8710e634b4f9f686bd0477bd92b272ec60801.tar.gz | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions