Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge6.out @ 2452:d1a7c8a5b835

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Emacs: use delete-region instead of kill-* functions. This patch eliminates `kill-line' which taints kill-ring, and `kill-entire-line' which is specific for XEmacs.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 17 Jun 2006 00:06:28 +0900
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line source

2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
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 heads' to see heads, 'hg merge' to merge)
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
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 heads' to see heads, 'hg merge' to merge)
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