Repository: cxf Updated Branches: refs/heads/master f0edc886b -> c15186dc8
If git cherry-pick doesn't have a conflict, we dont need to "record" the merge as "git cherry" will detect it Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c15186dc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c15186dc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c15186dc Branch: refs/heads/master Commit: c15186dc824a9850945d66c7e28c1c79003afde2 Parents: f0edc88 Author: Daniel Kulp <[email protected]> Authored: Wed Mar 19 15:03:47 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Wed Mar 19 15:03:47 2014 -0400 ---------------------------------------------------------------------- bin/DoMerges.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c15186dc/bin/DoMerges.java ---------------------------------------------------------------------- diff --git a/bin/DoMerges.java b/bin/DoMerges.java index 1fb9b0d..737cd3b 100644 --- a/bin/DoMerges.java +++ b/bin/DoMerges.java @@ -313,8 +313,6 @@ public class DoMerges { if (doCommit()) { records.add("M " + ver); } - } else { - records.add("M " + ver); } } private static void doMappedMerge(String ver) throws Exception {
