diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2013-03-25 03:39:58 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2013-04-15 21:46:12 +0200 |
| commit | aa7be667bcca4bdb28b2485e28a05da54c431df7 (patch) | |
| tree | 225b7caa073e96f1c5ef3ed83a65eaec6dcaa66a /org.eclipse.jgit.pgm/src/org | |
| parent | eaa52b12f542e1d52c277989533a3c1bea3cc02e (diff) | |
| download | jgit-aa7be667bcca4bdb28b2485e28a05da54c431df7.tar.gz jgit-aa7be667bcca4bdb28b2485e28a05da54c431df7.zip | |
Make recursive merge strategy the default merge strategy
Use recursive merge as the default strategy since it can successfully
merge more cases than the resolve strategy can. This is also the default
in native Git.
Change-Id: I38fd522edb2791f15d83e99038185edb09fed8e1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm/src/org')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java index 0a149016e6..24794e75f2 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java @@ -75,7 +75,7 @@ class Merge extends TextBuiltin { @Option(name = "--no-commit", usage = "usage_noCommit") private boolean noCommit = false; - private MergeStrategy mergeStrategy = MergeStrategy.RESOLVE; + private MergeStrategy mergeStrategy = MergeStrategy.RECURSIVE; @Argument(required = true) private String ref; |