diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:16:46 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:50:01 +0100 |
| commit | e06f678462c60f83e45ad32328f4633390983341 (patch) | |
| tree | 249cb914bbaa661dc63b806b90dd1211f3990fbc /git-debrebase | |
| parent | 63ddbee7d0c3bdfaf34cce3950c1a80fb97602c8 (diff) | |
git-debrebase: merge: test conflict: Test resolution via patch
This is a really horrible way to do things. We need a better
way to let the user help resolve this kind of merge.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
0 files changed, 0 insertions, 0 deletions