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

merge: move the bulk of simplemerge into core

- keep existing simplemerge command in contrib
- clean up test interface
parent 30d2fecaab76
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