diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-12-15 16:57:01 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2014-03-02 20:30:42 +0100 |
| commit | fd62a456499a57e5ae09c490b8bf2c72ff55154a (patch) | |
| tree | 05f39134c77bfd63e60de281fb0b7693aba59dae /org.eclipse.jgit.ant.test/META-INF | |
| parent | 31aeaa0931837f3601e6a0e4e3bd51075c1204c0 (diff) | |
| download | jgit-fd62a456499a57e5ae09c490b8bf2c72ff55154a.tar.gz jgit-fd62a456499a57e5ae09c490b8bf2c72ff55154a.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit.ant.test/META-INF')
0 files changed, 0 insertions, 0 deletions