Mercurial > hg > gitserve

comparison tests/test-extdiff.out @ 3336:49966b5ab16f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix traceback of extdiff after a merge - files that comes from a different branch are marked as modified but aren't present in the original manifest - add a testcase for extdiff and for regular diff
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 11 Oct 2006 16:35:09 +0200
parents 8fd6925ae32f
children
comparison
equal deleted inserted replaced
3328:a1aad25ccc3e 3336:49966b5ab16f
27 -I --include include names matching the given patterns 27 -I --include include names matching the given patterns
28 -X --exclude exclude names matching the given patterns 28 -X --exclude exclude names matching the given patterns
29 making snapshot of 1 files from rev e27a2475d60a 29 making snapshot of 1 files from rev e27a2475d60a
30 making snapshot of 1 files from rev 5e49ec8d3f05 30 making snapshot of 1 files from rev 5e49ec8d3f05
31 diffing a.e27a2475d60a a.5e49ec8d3f05 31 diffing a.e27a2475d60a a.5e49ec8d3f05
32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
34 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
35 (branch merge, don't forget to commit)
36 making snapshot of 1 files from rev 5e49ec8d3f05
37 making snapshot of 1 files from working dir
38 diffing a.5e49ec8d3f05 a
32 diff-like tools yield a non-zero exit code 39 diff-like tools yield a non-zero exit code