Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4878:372d93f03d3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: correctly handle combinations of whitespace options
author Matt Mackall <mpm@selenic.com>
date Sat, 14 Jul 2007 12:44:47 -0500
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