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

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

fetch: do not count inactive branches when inferring a merge...
fetch: do not count inactive branches when inferring a merge The fetch extension would erroneously consider inactive branches when inferring which branches to merge. It now considers only active branches.
Gilles Moris - - Load All Authors

File last commit:

r7758:e81e6c99 default
r7854:423b4482 default
Show More
test-extdiff.out
36 lines | 1.3 KiB | text/plain | TextLexer
/ tests / test-extdiff.out
History | Annotation | Raw |Copy content |Copy permalink
adding a
adding b
Only in a: a
Only in a: b
diffing a.000000000000 a
hg falabala [OPTION]... [FILE]...
use 'echo' to diff repository (or selected files)
Show differences between revisions for the specified
files, using the 'echo' program.
When two revision arguments are given, then changes are
shown between those revisions. If only one revision is
specified then that revision is compared to the working
directory, and, when no revisions are specified, the
working directory files are compared to its parent.
options:
-o --option pass option to comparison program
-r --rev revision
-c --change change made by revision
-I --include include names matching the given patterns
-X --exclude exclude names matching the given patterns
use "hg -v help falabala" to show global options
diffing a.8a5febb7f867/a a.34eed99112ab/a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
diffing a.2a13a4d2da36/a [tmp]/test-extdiff/a/a
diffing a.8a5febb7f867/a a.34eed99112ab/a
diffing a.2a13a4d2da36/a a.46c0e4daeb72/a
diff-like tools yield a non-zero exit code