diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 09:59:31 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 10:31:17 +0100 |
| commit | 9d98fd69e8abee17a59d27023e87215d55eb9385 (patch) | |
| tree | 8d7b58102d4048f603bba5922a8e8b3e41edfe55 /Debian/Dgit.pm | |
| parent | 393232b616d2d602f5cb8a81362ddbec7ee7e9fe (diff) | |
git-debrebase: merge: Detect octopi later
If git-debrebase or dgit were to make an octopus merge, we should
recognise that as an unknown kind of gdr/dgit merge, not as a general
octopus merge. This code motion leaves a spot where such a new kind
of merge could be classified.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'Debian/Dgit.pm')
0 files changed, 0 insertions, 0 deletions