annotate tests/test-merge6.out @ 1108:7a75d8fbbdaf
Remove some options from 'hg grep':
-Z (we have -0 as in locate)
-a (use "-r 0:tip" instead, or always grep all unless -r is given)
-e (we have the PATTERN argument)
-v (doesn't work, and this is more of a job for 'hg cat|grep')
-s (we have -q/--quiet)
-f (should be always enabled if -l used, or enable on -v/--verbose)
author |
Thomas Arendsen Hein <thomas@intevation.de> |
date |
Sat, 27 Aug 2005 23:36:25 +0200 |
parents |
9344f5dd4488 |
children |
ced2d3620f95 |
rev |
line source |
616
|
1 pulling from ../B1
|
|
2 searching for changes
|
|
3 adding changesets
|
|
4 adding manifests
|
775
|
5 adding file changes
|
1043
|
6 added 1 changesets with 1 changes to 1 files (+1 heads)
|
616
|
7 (run 'hg update' to get a working copy)
|
|
8 bar should remain deleted.
|
993
|
9 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
|
616
|
10 pulling from ../A2
|
|
11 searching for changes
|
|
12 adding changesets
|
|
13 adding manifests
|
775
|
14 adding file changes
|
1043
|
15 added 1 changesets with 0 changes to 0 files (+1 heads)
|
616
|
16 (run 'hg update' to get a working copy)
|
|
17 bar should remain deleted.
|
990
|
18 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
|