chiark / gitweb /
~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: a008f84)
Better error message if merge fails
authorKarl Hasselström <kha@treskal.com>
Wed, 19 Dec 2007 18:00:12 +0000 (18:00 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 19 Dec 2007 23:13:30 +0000 (23:13 +0000)
This message is no longer printed in case of conflicts, just in case
the merge really failed; so don't talk about conflicts in the error
message.

Signed-off-by: Karl Hasselström <kha@treskal.com>

No differences found
GIT patch-maintenance porcelain (local modifications)