chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 63ddbee) | patch
git-debrebase: merge: test conflict: Test resolution via patch
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 12 Aug 2018 00:16:46 +0000 (01:16 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 12 Aug 2018 00:50:01 +0000 (01:50 +0100)
commite06f678462c60f83e45ad32328f4633390983341
tree249cb914bbaa661dc63b806b90dd1211f3990fbctree | snapshot
parent63ddbee7d0c3bdfaf34cce3950c1a80fb97602c8commit | 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>
tests/tests/gdr-merge-conflicts diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.