##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: consider the file merged when using :merge-{local,other}...
merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See 6217040b2780 and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999
Martin von Zweigbergk -
r49415:50de0890 default
Show More
Name Size Modified Last Commit Author
/ rust / hg-core / src
config
copy_tracing
dirstate
dirstate_tree
operations
revlog
utils
ancestors.rs Loading ...
config.rs Loading ...
copy_tracing.rs Loading ...
dagops.rs Loading ...
dirstate.rs Loading ...
dirstate_tree.rs Loading ...
discovery.rs Loading ...
errors.rs Loading ...
exit_codes.rs Loading ...
filepatterns.rs Loading ...
lib.rs Loading ...
lock.rs Loading ...
logging.rs Loading ...
matchers.rs Loading ...
repo.rs Loading ...
requirements.rs Loading ...
revlog.rs Loading ...
revset.rs Loading ...
testing.rs Loading ...
utils.rs Loading ...
vfs.rs Loading ...