changeset 27050 | df9b73d2d444 |
parent 27034 | 86ede9eda252 |
child 27344 | 43c00ca887d1 |
--- a/hgext/largefiles/overrides.py Sat Nov 14 00:07:11 2015 -0800 +++ b/hgext/largefiles/overrides.py Wed Nov 18 17:40:13 2015 -0800 @@ -544,7 +544,7 @@ # largefiles. This will handle identical edits without prompting the user. def overridefilemerge(origfn, premerge, repo, mynode, orig, fcd, fco, fca, labels=None): - if not lfutil.isstandin(orig): + if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent(): return origfn(premerge, repo, mynode, orig, fcd, fco, fca, labels=labels)