Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-revert2.out @ 1933:7544700fd931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 13 Mar 2006 13:05:41 +0100
parents 3b1b44b917f4
children d436b21b20dc
comparison
equal deleted inserted replaced
1932:82995896d5af 1933:7544700fd931
1 1:f4d7a8c73d23 1 1:f248da0d4c3e
2 0:232e179b3f29 2 0:9eca13a34789
3 f4d7a8c73d23 tip 3 f248da0d4c3e tip
4 232e179b3f29 4 9eca13a34789
5 232e179b3f29+ 5 9eca13a34789+
6 232e179b3f29 6 9eca13a34789
7 f4d7a8c73d23 tip 7 f248da0d4c3e tip
8 merge: warning: conflicts during merge 8 merge: warning: conflicts during merge
9 merging file1 9 merging file1
10 merging file1 failed! 10 merging file1 failed!
11 diff -r f4d7a8c73d23 file1 11 diff -r f248da0d4c3e file1
12 --- a/file1 12 --- a/file1
13 +++ b/file1 13 +++ b/file1
14 @@ -1,3 +1,7 @@ added file1 14 @@ -1,3 +1,7 @@ added file1
15 added file1 15 added file1
16 another line of text 16 another line of text
18 +changed file1 different 18 +changed file1 different
19 +======= 19 +=======
20 changed file1 20 changed file1
21 +>>>>>>> 21 +>>>>>>>
22 M file1 22 M file1
23 f4d7a8c73d23+ tip 23 f248da0d4c3e+ tip
24 f4d7a8c73d23 tip 24 f248da0d4c3e tip
25 f4d7a8c73d23 tip 25 f248da0d4c3e tip
26 f4d7a8c73d23 tip 26 f248da0d4c3e tip