summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorChristian Halstrick <christian.halstrick@sap.com>2010-08-23 17:07:03 +0200
committerChristian Halstrick <christian.halstrick@sap.com>2010-08-31 01:29:49 +0200
commit47f4171315e1b65f2a6e7f5fc38f57d81de5db15 (patch)
treec2e01922de343cd75ea9ab66524dfc772b491a8a /pom.xml
parent45e79a526c7ffebaf8e4758a6cb6b7af05716707 (diff)
downloadjgit-47f4171315e1b65f2a6e7f5fc38f57d81de5db15.tar.gz
jgit-47f4171315e1b65f2a6e7f5fc38f57d81de5db15.zip
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>
Diffstat (limited to 'pom.xml')
0 files changed, 0 insertions, 0 deletions