Skip to content
Snippets Groups Projects
Commit 2371f4aea665 authored by Matt Mackall's avatar Matt Mackall
Browse files

merge: give a special message for internal:merge failure (issue3105)

parent d5abe76da61e
No related branches found
No related tags found
No related merge requests found
Showing
with 33 additions and 29 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment