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

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

fetch: switch the default parent used for a merge...
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
Brad Schick - - Load All Authors

File last commit:

r5137:2be225ea default
r6206:0b6f1249 default
Show More
test-extdiff.out
33 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-extdiff.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906 adding a
Brad Schick
extdiff: do single file diffs from the wc with no copy...
 r5137 adding b
Thomas Arendsen Hein
Don't require a diff which accepts the -N option.
 r3751 Only in a: a
Brad Schick
extdiff: do single file diffs from the wc with no copy...
 r5137 Only in a: b
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906 diffing a.000000000000 a
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
 r4730 hg falabala [OPTION]... [FILE]...
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906
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
-I --include include names matching the given patterns
-X --exclude exclude names matching the given patterns
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
 r4315
use "hg -v help falabala" to show global options
Brad Schick
extdiff: do single file diffs from the wc with no copy...
 r5137 diffing a.8a5febb7f867/a a.34eed99112ab/a
Benoit Boissinot
fix traceback of extdiff after a merge...
 r3330 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Thomas Arendsen Hein
Fixed test-extdiff....
 r2912 diff-like tools yield a non-zero exit code
Brad Schick
extdiff: do single file diffs from the wc with no copy...
 r5137 diffing a.34eed99112ab/c [tmp]/test-extdiff/a/c