view tests/test-convert-hg-source.out @ 5467:521284cdbcb4

mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs
author NIIMI Satoshi <sa2c@sa2c.net>
date Thu, 11 Oct 2007 06:10:45 +0900
parents 11e1e574da02
children
line wrap: on
line source

merging baz and foo
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging foo and baz
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
initializing destination new repository
scanning source...
sorting...
converting...
4 add foo bar
3 change foo
2 make bar and baz copies of foo
1 merge local copy
0 merge remote copy
comparing with ../orig
searching for changes
no changes found