]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 18e0202) | patch
Add tests for output result of merging -- org.eclipse.jgit.pgm.Merge 62/7762/2
authorTomasz Zarna <Tomasz.Zarna@pl.ibm.com>
Fri, 14 Sep 2012 15:31:33 +0000 (17:31 +0200)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 17 Sep 2012 14:07:00 +0000 (07:07 -0700)
commitf7b644df66d5f975d858aca3f977f31baf4a2264
treefc626cdd0a8d73082321871886a650410d6a46fdtree | snapshot
parent18e020218b210ef5867bb07ff8f2b889e467d7fccommit | diff
Add tests for output result of merging -- org.eclipse.jgit.pgm.Merge

Change-Id: I888c7e80503b869d65a9617e6a07e01d1ff5f197
org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF diff | blob | history
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeTest.java [new file with mode: 0644] blob
org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties diff | blob | history
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java diff | blob | history
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit