Mercurial > hg

view tests/test-merge5.out @ 4825:3cf94964c56b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg log: Move filtering implicit parents to own method and use it in templater. Extended test repo in test-command-template to contain changeset to test this.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 08 Jul 2007 12:52:08 +0200
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