Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4537:2f489b00f8eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Brendan Cully <brendan@kublai.com>
date Sun, 10 Jun 2007 21:05:01 -0700
parents fffc8a733bf9
children
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