Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Kügler2014-01-17 20:20:45 +0000
committerMatthias Sohn2014-05-04 09:52:24 +0000
commit0ef4aaa0744cb3083ea16093eb779e96bc90abcc (patch)
tree70dc357c438a8974f8c782a32bd6fd2d63693916 /org.eclipse.egit.mylyn.ui.test/META-INF
parent210bff1cdae0226139ad26235449ef8250d6c9cb (diff)
downloadegit-0ef4aaa0744cb3083ea16093eb779e96bc90abcc.tar.gz
egit-0ef4aaa0744cb3083ea16093eb779e96bc90abcc.tar.xz
egit-0ef4aaa0744cb3083ea16093eb779e96bc90abcc.zip
Use branch.<name>.mergeoptions to set merge defaults
When presenting the MergeTargetSelectionDialog look at the mergeoptions configuration to pre-select the merge type (commit/no-commit/squash) in the dialog. This was already done for the fast forward configuration. Also honor the configured merge options when merging without a dialog. Change-Id: I06b77ca5f1de1ea6045ba07573ffe7573e51b849 Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.mylyn.ui.test/META-INF')
0 files changed, 0 insertions, 0 deletions

Back to the top