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

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

changectx: ancestor should only prefer merge.preferancestor if it is a revision...
changectx: ancestor should only prefer merge.preferancestor if it is a revision The value '*' currently designates that bid merge should be used. The best way to test bid merge is to set preferancestor=* in the configuration file ... but then it would abort with unknown revision '*' when other code paths ended up in changectx.ancestor . Instead, just skip and ignore the value '*' when looking for a preferred ancestor.
Mads Kiilerich -
r22180:17011b36 stable
Show More
Name Size Modified Last Commit Author
/ tests / bundles
darcs1.hg Loading ...
hgweb+obs.hg Loading ...
issue4041.hg Loading ...
legacy-encoding.hg Loading ...
rebase-revset.hg Loading ...
rebase.hg Loading ...
rebase.sh Loading ...
remote.hg Loading ...
remote.sh Loading ...
rename.sh Loading ...
renames.hg Loading ...
tampered.hg Loading ...
test-invalid-branch-name.hg Loading ...
test-keyword.hg Loading ...
test-manifest.hg Loading ...
test-merge-symlinks.hg Loading ...
test-no-symlinks.hg Loading ...