git-debrebase: do not bomb on totally ambiguous pseudomerges

Actually, we want `git-merge -s ours' (or `git-debrebase stitch')
to be comprehended.  We sacrifice `git-merge -s theirs'.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index 3d837272ac1b4f2e4a3aab9cdaa0a19fc0de765a..932a3b7a6aed3b67fe40d9846aa5366da1432d78 100755 (executable)
--- 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),