tests/test-grep.out
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Tue, 21 Feb 2006 15:48:09 -0600
changeset 1770 4eea6a747c27
parent 1148 fad2d091c74f
child 2868 81f351c5264d
permissions -rw-r--r--
hgmerge: fix diff+patch detection; cleanups Details: - actually show help message when no tools are found - whitespace cleanup (stupid emacs) - quote more variables - simplify merge/diff3 error handling
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1148
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     1
port:4:export
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     2
port:4:vaportight
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     3
port:4:import/export
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     4
FIXME: history is wrong here
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     5
port:1:1:-:eggs:import
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     6
port:1:2:+:eggs:vaportight
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     7
port:1:3:+:eggs:import/export
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     8
port:0:2:+:spam:export
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     9
port:0:1:+:spam:import
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
    10
port:4:import/export