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

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

merge: fix --preview to show all nodes that will be merged (issue2043)....
merge: fix --preview to show all nodes that will be merged (issue2043). Formerly, it omitted nodes that were not descendants of the least common ancestor of the two merge parents, even though those nodes contribute to the merge. The new algorithm uses revlog.findmissing() instead of ancestor() + nodesbetween().
Brodie Rao - - Load All Authors

File last commit:

r10455:40dfd46d default
r10505:b3311e26 stable
Show More
test-hgrc.out
24 lines | 726 B | text/plain | TextLexer
/ tests / test-hgrc.out
History | Annotation | Raw |Copy content |Copy permalink
hg: config error at $HGRCPATH:1: 'invalid'
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
[paths]
default = .../foo%bar
default = .../foo%bar
bundle.mainreporoot=.../foobar
paths.default=.../foo%bar
hg: config error at $HGRCPATH:2: ' x = y'
foo.bar=a\nb\nc\nde\nfg
foo.baz=bif cb
hg: config error at $HGRCPATH:1: cannot include /no-such-file (No such file or directory)
% customized hgrc
.../.hgrc:8: defaults.identify=-n
.../.hgrc:2: ui.debug=true
.../.hgrc:3: ui.fallbackencoding=ASCII
.../.hgrc:4: ui.quiet=true
.../.hgrc:5: ui.traceback=true
.../.hgrc:6: ui.verbose=true
% plain hgrc
none: ui.traceback=True
none: ui.verbose=False
none: ui.debug=True
none: ui.quiet=False