Mercurial > hg
annotate tests/test-conflict.out @ 1960:dac4bd67f6c5
update test for unrelated repo.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Tue, 14 Mar 2006 23:00:45 -0800 |
parents | 7544700fd931 |
children | b2ae81a7df29 |
rev | line source |
---|---|
346 | 1 merge: warning: conflicts during merge |
2 merging a | |
3 merging a failed! | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
4 e7fe8eb3e180+0d24b7662d3e+ tip |
346 | 5 something else |
6 ======= | |
7 something | |
748 | 8 M a |