diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 20:25:16 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 21:00:31 +0100 |
| commit | 6392501bee3f167ca61ba648413190ac83cf4257 (patch) | |
| tree | 80f9718e72dbea63db7e35273b6c3f5adb1ee296 /tests/lib-orig-include-exclude | |
| parent | dea27c626d6c39d11a1b591005fd2e6e2a17e295 (diff) | |
git-debrebase: Merge: Remove some xxx's
git-debrebase(5) already has ILLEGAL OPERATIONS (which forbids many
git-rebase operations) and also of course LEGAL OPERATIONS.
The limitations on what kind of merges we can resolve and how will be
documented when we document the merge machinery properly.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/lib-orig-include-exclude')
0 files changed, 0 insertions, 0 deletions