diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-17 22:51:16 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:58 +0100 |
| commit | c386ae2688431a622f9d41b3668755420fcbed39 (patch) | |
| tree | b8fa63c9356a272da7787296323cba13db5fd673 /tests | |
| parent | ebf4736038f724689ccc6177d222483fd023866d (diff) | |
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>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions