tests/test-merge6.out
author TK Soh <teekaysoh@yahoo.com>
Tue, 14 Mar 2006 22:01:30 -0800
changeset 1953 379ab45b91b7
parent 1043 9344f5dd4488
child 2019 ced2d3620f95
permissions -rw-r--r--
change default strftime format for better portability On some systems, such as Solaris and HP-UX, "%c" format give output without the leading zero on the single-digit month-day.

pulling from ../B1
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg update' to get a working copy)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
pulling from ../A2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg update' to get a working copy)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo