Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge5.out @ 1641:1ef060ae7966
bash_completion: be more careful about whitespaces
- use awk to parse the output of hg help.
- print one completion candidate per line
- print the debug commands after regular commands
(this eases the shell side of the parsing)
- don't print aliases that are simple abbreviations
(e.g. up/update, id/identify)
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 27 Jan 2006 12:10:35 +0100 |
parents | 5a034646e472 |
children | ced2d3620f95 |
rev | line source |
---|---|
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
1 removing b |
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
2 this update spans a branch affecting the following files: |
616 | 3 b |
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
4 aborting update spanning branches! |
819
77e121a0d870
Update output for test-merge5.
Bryan O'Sullivan <bos@serpentine.com>
parents:
814
diff
changeset
|
5 (use update -m to merge across branches or -C to lose changes) |