Branch: refs/heads/master
Home: https://github.com/jenkinsci/jenkins
Commit: 1e804fdf2746e224d175d2de764111aa22860a25
https://github.com/jenkinsci/jenkins/commit/1e804fdf2746e224d175d2de764111aa22860a25
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2016-02-24 (Wed, 24 Feb 2016)
Changed paths:
M test/src/test/java/hudson/cli/CLIRegistererTest.java
M test/src/test/java/hudson/cli/GroovyshCommandTest.java
M test/src/test/java/hudson/cli/HelpCommandTest.java
Log Message:
-----------
Looks like an interesting form of a merge conflict.
--
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/d/optout.
