Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge6.out @ 1967:72f7a335b955

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
still use old variable names when running hooks. dropped by accident. we set HG_FOO (new name) and FOO (old name). plan is to drop old names after 0.9.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 17 Mar 2006 09:48:43 -0800
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