Skip to content
Snippets Groups Projects
Commit 940c05b25b07 authored by Simon Farnsworth's avatar Simon Farnsworth
Browse files

merge: add conflict labels to merge command

Now that we present the conflict labels in prompts, it's useful to have
better names than "local" and "other" for every command.
parent 8e805cf27caa
No related branches found
No related tags found
No related merge requests found
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