Mercurial > hg

diff tests/test-merge6.out @ 6042:2da5b19a6460

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 06 Feb 2008 19:57:52 -0800
parents 8feb33c2d153
children 0750f11152fe
line wrap: on
line diff
--- a/tests/test-merge6.out	Thu Jul 26 07:56:27 2007 -0400
+++ b/tests/test-merge6.out	Wed Feb 06 19:57:52 2008 -0800
@@ -11,7 +11,7 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 bar should remain deleted.
-f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
+f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo
 pulling from ../A2
 searching for changes
 adding changesets
@@ -22,4 +22,4 @@
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 bar should remain deleted.
-f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
+f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo