]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 31aeaa0) | patch
Fix merge/cherry-picking in CRLF mode 60/22060/3
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Sun, 15 Dec 2013 15:57:01 +0000 (16:57 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Sun, 2 Mar 2014 19:30:42 +0000 (20:30 +0100)
commitfd62a456499a57e5ae09c490b8bf2c72ff55154a
tree05f39134c77bfd63e60de281fb0b7693aba59daetree | snapshot
parent31aeaa0931837f3601e6a0e4e3bd51075c1204c0commit | diff
Fix merge/cherry-picking in CRLF mode

This fixes a case where we have CRLF in the repo but
LF in the worktree and are in autocrlf mode.

Change-Id: I0388270c1cf0fd22dfd513bcaa404eb97268d39d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit