motiejus
/
jgit
1
Fork 0
Code Releases Activity

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>
This commit is contained in:
Christian Halstrick 2010-08-23 17:07:03 +02:00
parent 45e79a526c
commit 47f4171315
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
View File

@ -84,7 +84,7 @@
*/
public class MergeCommand extends GitCommand<MergeResult> {
private MergeStrategy mergeStrategy = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE;
private MergeStrategy mergeStrategy = MergeStrategy.RESOLVE;
private List<Ref> commits = new LinkedList<Ref>();