X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=932a3b7a6aed3b67fe40d9846aa5366da1432d78;hb=557f90d88992e61580113baa2e4da0b4427d7cb4;hp=3d837272ac1b4f2e4a3aab9cdaa0a19fc0de765a;hpb=9ba4f33ee531a379f7d55b6b32b3d9221d7ec04f;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 3d837272..932a3b7a 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -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),