Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4383:1bcf38111877

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update copyright year and change to range
author Lee Cantey <lcantey@gmail.com>
date Fri, 27 Apr 2007 16:04:17 -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