Branch: refs/heads/refactoring
Home: https://github.com/jenkinsci/git-plugin
Commit: f4cf2b27891f12b51fd518b1f4e0c3ba00992b46
https://github.com/jenkinsci/git-plugin/commit/f4cf2b27891f12b51fd518b1f4e0c3ba00992b46
Author: Sergey Mylnikov <[email protected]>
Date: 2013-08-30 (Fri, 30 Aug 2013)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
M src/main/java/hudson/plugins/git/UserMergeOptions.java
M src/main/java/hudson/plugins/git/extensions/GitSCMExtension.java
M src/main/java/hudson/plugins/git/extensions/impl/PreBuildMerge.java
M src/main/java/hudson/plugins/git/opt/PreBuildMergeOptions.java
M src/main/resources/hudson/plugins/git/UserMergeOptions/config.jelly
A
src/main/resources/hudson/plugins/git/UserMergeOptions/help-mergeStrategy.html
M src/test/java/hudson/plugins/git/GitPublisherTest.java
M src/test/java/hudson/plugins/git/GitSCMTest.java
Log Message:
-----------
Choosing merge strategy
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
