test suite noticed a direct mode reversion
This commit is contained in:
parent
10ecc43790
commit
f3be28eedc
1 changed files with 4 additions and 1 deletions
|
@ -129,7 +129,10 @@ resolveMerge' unstagedmap (Just us) them u = do
|
||||||
| keyUs /= keyThem -> resolveby [keyUs, keyThem] $ do
|
| keyUs /= keyThem -> resolveby [keyUs, keyThem] $ do
|
||||||
makeannexlink keyUs LsFiles.valUs
|
makeannexlink keyUs LsFiles.valUs
|
||||||
makeannexlink keyThem LsFiles.valThem
|
makeannexlink keyThem LsFiles.valThem
|
||||||
liftIO $ nukeFile file
|
-- cleanConflictCruft can't handle unlocked
|
||||||
|
-- files, so delete here.
|
||||||
|
unless (islocked LsFiles.valUs) $
|
||||||
|
liftIO $ nukeFile file
|
||||||
| otherwise -> do
|
| otherwise -> do
|
||||||
-- Only resolve using symlink when both
|
-- Only resolve using symlink when both
|
||||||
-- were locked, otherwise use unlocked
|
-- were locked, otherwise use unlocked
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue