diff options
| author | Beat Bolli <dev+git@drbeat.li> | 2015-11-23 22:32:12 +0100 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-11-24 18:55:26 -0500 |
| commit | 3c6de746bd461705fdaa6113085e62fb55705049 (patch) | |
| tree | c58b4719d19f416304a5cf0d258f4c06a73905a5 /xdiff/xdiff.h | |
| parent | 5cb2e162d21fa45a63f186b31970e2e9c9b10ba9 (diff) | |
| download | git-bb/merge-marker-crlf.tar.gz | |
merge-file: consider core.crlf when writing merge markersbb/merge-marker-crlf
When merging files in repos with core.eol = crlf, git merge-file inserts
just a LF at the end of the merge markers. Files with mixed line endings
cause trouble in Windows editors and e.g. contrib/git-jump, where an
unmerged file in a run of "git jump merge" is reported as simply "binary
file matches".
Fixing this improves Git's behavior under Windows.
Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index c0339919cc..a5bea4a5bb 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -122,6 +122,7 @@ typedef struct s_xmparam { int level; int favor; int style; + int crlf; const char *ancestor; /* label for orig */ const char *file1; /* label for mf1 */ const char *file2; /* label for mf2 */ |