summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ebf4736)
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>
} elsif ($order < 0) {
@bytime = reverse @bytime;
} else {
} 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),
}
return $classify->(qw(Pseudomerge),
SubType => qw(Ambiguous),