]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 45e79a5) | patch
Let Resolve be the default Merge strategy 62/1462/1
authorChristian Halstrick <christian.halstrick@sap.com>
Mon, 23 Aug 2010 15:07:03 +0000 (17:07 +0200)
committerChristian Halstrick <christian.halstrick@sap.com>
Mon, 30 Aug 2010 23:29:49 +0000 (01:29 +0200)
commit47f4171315e1b65f2a6e7f5fc38f57d81de5db15
treec2e01922de343cd75ea9ab66524dfc772b491a8atree | snapshot
parent45e79a526c7ffebaf8e4758a6cb6b7af05716707commit | diff
Let Resolve be the default Merge strategy

the merge command should use by default the "resolve" merge strategy.

Change-Id: I6c6973a3397cca12bd8a6bd950d04b1766a08b4c
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit