Mercurial > hg > gitweb

view tests/test-merge5.out @ 3108:67874ebbb7dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: linear_path -> linear
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 16:50:17 -0500
parents 49988d9f0758
children 41989e55fa37
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