chiark / gitweb /
git-debrebase: do not bomb on totally ambiguous pseudomerges
[dgit.git] / git-debrebase
index 3d83727..932a3b7 100755 (executable)
@@ -461,7 +461,8 @@ sub classify ($) {
        } elsif ($order < 0) {
            @bytime = reverse @bytime;
        } else {
-           return $unknown->('merge of two identical same-age parents');
+           # same age, default to order made by -s ours
+           # that is, commit was made by someone who preferred L
        }
        return $classify->(qw(Pseudomerge),
                           SubType => qw(Ambiguous),