Skip to content
Snippets Groups Projects
Commit 7fa3560443fd authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

filemerge: switch trymerge boolean to mergetype enum

trymerge = False becomes mergetype = nomerge, and trymerge = True becomes
mergetype = fullmerge or mergeonly, depending on whether a premerge happens.
parent abc2327e382a
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