diff options
author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
---|---|---|
committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /tests/test-extdiff.t | |
parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
download | mercurial-tarball-master.tar.gz |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'tests/test-extdiff.t')
-rw-r--r-- | tests/test-extdiff.t | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/tests/test-extdiff.t b/tests/test-extdiff.t index d4190c4..40aab85 100644 --- a/tests/test-extdiff.t +++ b/tests/test-extdiff.t @@ -39,15 +39,15 @@ Should diff cloned directories: options: - -o --option OPT [+] pass option to comparison program - -r --rev REV [+] revision - -c --change REV change made by revision - -I --include PATTERN [+] include names matching the given patterns - -X --exclude PATTERN [+] exclude names matching the given patterns + -o --option OPT [+] pass option to comparison program + -r --rev REV [+] revision + -c --change REV change made by revision + -I --include PATTERN [+] include names matching the given patterns + -X --exclude PATTERN [+] exclude names matching the given patterns [+] marked option can be specified multiple times - use "hg -v help falabala" to show more info + use "hg -v help falabala" to show global options $ hg ci -d '0 0' -mtest1 @@ -92,8 +92,6 @@ Check diff are made from the first parent: diffing */extdiff.*/a.2a13a4d2da36/a a.46c0e4daeb72/a (glob) diff-like tools yield a non-zero exit code -#if execbit - Test extdiff of multiple files in tmp dir: $ hg update -C 0 > /dev/null @@ -182,10 +180,6 @@ Test with revsets: $ cd .. -#endif - -#if symlink - Test symlinks handling (issue1909) $ hg init testsymlinks @@ -200,5 +194,3 @@ Test symlinks handling (issue1909) diffing testsymlinks.07f494440405 testsymlinks [1] $ cd .. - -#endif |