diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2014-04-29 23:08:29 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-04-30 10:30:02 -0700 |
| commit | de3d8bb7736cafae0ff10e047e2afa994b1dd901 (patch) | |
| tree | 50e012639e64906fd9909829d32732d30da767d7 /Documentation/git-fast-export.txt | |
| parent | Git 1.8.5.5 (diff) | |
| download | tgif-de3d8bb7736cafae0ff10e047e2afa994b1dd901.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-fast-export.txt')
0 files changed, 0 insertions, 0 deletions