Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge1.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 | 5a034646e472 |
children | 67a28636ea64 |
rev | line source |
---|---|
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
1 merging for b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
2 merging b |
430 | 3 This is file b1 |
4 merging for b | |
5 merging b | |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
6 merging for b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
7 merging b |