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

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

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels...
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels Before this patch, we use a combination of `mode` and `labels` to decide which marker style to use. That's mostly my own fault because I was the one who added the `mergediff` as a "mode" instead of adding a separate argument for marker style. Still, let's make these arguments more orthogonal by ignoring the number of labels when deciding which marker style to use. This refactoring makes it a little clearer in the simplemerge *extension* that passing more than 2 `--label` arguments changes the marker style. Differential Revision: https://phab.mercurial-scm.org/D11972
Gregory Szorc - - Load All Authors

File last commit:

r38031:6f5b4cee default
r49404:c9141848 default
Show More
linux-wheel-centos5-blacklist
3 lines | 59 B | text/plain | TextLexer
/ contrib / packaging / linux-wheel-centos5-blacklist
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
packaging: move linux-wheel-centos5-blacklist to contrib/packaging/...
 r38031 test-convert-git.t
test-subrepo-git.t
test-patchbomb-tls.t