Mercurial > hg

view tests/test-merge5.out @ 5576:1c1ef561d541

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Matt Mackall <mpm@selenic.com>
date Sun, 02 Dec 2007 15:52:36 -0600
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes