]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4e0e1b4) | patch
Honor CRLF settings when writing merge results 63/116563/4
authorThomas Wolf <thomas.wolf@paranor.ch>
Thu, 1 Feb 2018 20:58:23 +0000 (21:58 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 1 Feb 2018 23:45:32 +0000 (00:45 +0100)
commitfc7d407d0bd056534f2407d8532cc035617b08d6
treec5a2c2186b23509f295716cf28406ec32add71b1tree | snapshot
parent4e0e1b4e86a98e87b5e9febe3c7d019300a99a22commit | diff
Honor CRLF settings when writing merge results

Merges are performed using the raw text as stored in the git
repository. When we write the merge result, we must apply the
correct CRLF settings. Otherwise the line endings in the result
will be wrong.

Bug: 499615
Change-Id: I37a9b987e9404c97645d2720cd1c7c04c076a96b
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java diff | blob | history
org.eclipse.jgit/.settings/.api_filters [new file with mode: 0644] blob
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