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

filemerge: clean up some dead code

We now exit early if we do a premerge, so extra checks are no longer necessary.
parent a38924f7680c
No related merge requests found
......@@ -522,12 +522,8 @@
# complete if premerge successful (r is 0)
return not r, r
if not r: # premerge successfully merged the file
needcheck = False
else:
needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf,
files, labels=labels)
needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, files,
labels=labels)
if needcheck:
r = _check(r, ui, tool, fcd, files)
......
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