Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge-revert2.out @ 1844:b768f3ae0c2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove patchbomb from list of contrib files to install since it's now an extension. Innosetup script was referencing old contrib location. Also cosmetic change to group related files.
author Lee Cantey <lcantey@gmail.com>
date Mon, 06 Mar 2006 21:03:46 -0800
parents 3b1b44b917f4
children 7544700fd931
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
 added file1
 another line of text
+<<<<<<<
+changed file1 different
+=======
 changed file1
+>>>>>>>
M file1
f4d7a8c73d23+ tip
f4d7a8c73d23 tip
f4d7a8c73d23 tip
f4d7a8c73d23 tip