| commit | de3d8bb7736cafae0ff10e047e2afa994b1dd901 | |
| author | Felipe Contreras <felipe.contreras@gmail.com> | |
| Wed, 30 Apr 2014 04:08:29 +0000 (29 23:08 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Apr 2014 17:30:02 +0000 (30 10:30 -0700) | ||
| tree | 50e012639e64906fd9909829d32732d30da767d7 | treesnapshot (tar.gz zip) |
| parent | 7bbc4e8fdb33e0a8e42e77cc05460d4c4f615f4d | commitdiff |
rerere: fix for merge.conflictstyle
If we use a different conflict style `git rerere forget` is not able
to find the matching conflict SHA-1 because the diff generated is
actually different from what `git merge` generated, due to the
XDL_MERGE_* option differences among the codepaths.
The fix is to call git_xmerge_config() so that git_xmerge_style is set
properly and the diffs match.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If we use a different conflict style `git rerere forget` is not able
to find the matching conflict SHA-1 because the diff generated is
actually different from what `git merge` generated, due to the
XDL_MERGE_* option differences among the codepaths.
The fix is to call git_xmerge_config() so that git_xmerge_style is set
properly and the diffs match.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/rerere.c | diffblobblamehistory |