Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge6.out @ 1422:a7e8408ac79c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py2exe is not able to handle win32com.shell Changes: - setup.py: help py2exe finding the shell module in win32com.shell
author Volker Kleinfeld <Volker.Kleinfeld@gmx.de>
date Mon, 24 Oct 2005 14:52:41 -0700
parents 9344f5dd4488
children ced2d3620f95
line wrap: on
line source

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