tests/test-dispatch.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104 9514cbb6e4f6
parent 6448 cd3d49ffc6f6
child 8004 d5b1b846f277
permissions -rw-r--r--
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).

adding a
# missing arg
hg cat: invalid arguments
hg cat [OPTION]... FILE...

output the current or given revision of files

    Print the specified files as they were at the given revision.
    If no revision is given, the parent of the working directory is used,
    or tip if no revision is checked out.

    Output may be to a file, in which case the name of the file is
    given using a format string. The formatting rules are the same as
    for the export command, with the following additions:

    %s   basename of file being printed
    %d   dirname of file being printed, or '.' if in repo root
    %p   root-relative path name of file being printed

options:

 -o --output   print output to file with formatted name
 -r --rev      print the given revision
    --decode   apply any matching decode filter
 -I --include  include names matching the given patterns
 -X --exclude  exclude names matching the given patterns

use "hg -v help cat" to show global options
% [defaults]
a
a
% no repo
abort: There is no Mercurial repository here (.hg not found)!