Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5206:0f6a1bdf89fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
match: handle large regexes Some Python versions don't handle large regexes, so when we hit an overflow, split our regex in two.
author Matt Mackall <mpm@selenic.com>
date Sun, 19 Aug 2007 14:03:56 -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