Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge6.out @ 1239:29f17e083e84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Turn hgit into an extension, and add commands supporting the latest gitk
author mason@suse.com
date Tue, 13 Sep 2005 19:33:10 -0500
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