Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert2.out @ 1150:4ee09418c8e5
bash_completion: better handling of aliases
Instead of listing every alias in the big case..esac, use hg help
to get the canonical name of the command.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 29 Aug 2005 20:37:07 +0200 |
parents | 5a034646e472 |
children | 3b1b44b917f4 |
line wrap: on
line source
1:f4d7a8c73d23 0:232e179b3f29 f4d7a8c73d23 tip 232e179b3f29 232e179b3f29+ 232e179b3f29 f4d7a8c73d23 tip merge: warning: conflicts during merge merging file1 merging file1 failed! diff -r f4d7a8c73d23 file1 --- a/file1 +++ b/file1 @@ -1,3 +1,7 @@ added file1 another line of text +<<<<<<< +changed file1 different +======= changed file1 +>>>>>>> M file1 f4d7a8c73d23+ tip f4d7a8c73d23 tip f4d7a8c73d23 tip f4d7a8c73d23 tip