chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c57fd0c) | patch
git-debrebase: merge: Introduce new merge_failed sub
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 17:00:44 +0000 (18:00 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:11:08 +0000 (20:11 +0100)
commit49e8f18bc896d9a9dd8aedb3495854c39439c86c
treeee0ec0af539d130a3080b587df0f5f2b99eb7e42tree | snapshot
parentc57fd0c0dac97a1a3c683e479cc2d4d0fdc89060commit | diff
git-debrebase: merge: Introduce new merge_failed sub

And call it from $nomerge in walk.  Now we produce a sane error
message.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.