]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a5c40a3) | patch
Do not add a newline at the end if neither merged side had one 19/33219/6
authorAndré de Oliveira <andre.oliveira@liferay.com>
Wed, 10 Sep 2014 19:02:05 +0000 (16:02 -0300)
committerMatthias Sohn <matthias.sohn@sap.com>
Sat, 28 Mar 2015 00:42:49 +0000 (20:42 -0400)
commit3cd7d0d85a5fe6ba03f218898e866f06258b7405
tree2c8ba29714cb14a38a35bc0a3fa2d4c71a582a8etree | snapshot
parenta5c40a38622db55d323084f766f0bf50a5299765commit | diff
Do not add a newline at the end if neither merged side had one

Bug: 390833
Change-Id: I29f7b79b241929877c93ac485c677487a91bb77b
Signed-off-by: André de Oliveira <andre.oliveira@liferay.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/EolAwareOutputStream.java [new file with mode: 0644] blob
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatterPass.java [new file with mode: 0644] blob
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit