diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 18:00:44 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:11:08 +0100 |
| commit | 49e8f18bc896d9a9dd8aedb3495854c39439c86c (patch) | |
| tree | ee0ec0af539d130a3080b587df0f5f2b99eb7e42 /tests | |
| parent | c57fd0c0dac97a1a3c683e479cc2d4d0fdc89060 (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>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions