Mercurial > hg
comparison tests/test-generaldelta.t @ 27123:4dc5951df1e4
filemerge: in ':fail' tool, write out other side if local side is deleted
We do this because we don't want to modify the dirstate for failures, and don't
just want to leave the file missing from disk. Plus it's more useful for the
user if the changed side is written out -- it is easier to delete a file than
to get it back via hg revert.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 24 Nov 2015 10:57:01 -0800 |
parents | f43689badeff |
children | 762fbd28e7df |
comparison
equal
deleted
inserted
replaced
27122:77d760ba8dcd | 27123:4dc5951df1e4 |
---|