tests/test-merge8.out
author Matt Mackall <mpm@selenic.com>
Sun, 02 Dec 2007 15:52:36 -0600
changeset 5576 1c1ef561d541
parent 4416 bb1800a7d7e1
child 6338 0750f11152fe
permissions -rw-r--r--
doc: add repo/ to .hgignore and .hgtags These names were disappearing in the asciidoc output and no form of escaping seems to help. Let's just add repo/ to make it explicit that they're in the repository root.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved