Mercurial > hg > gitweb

view tests/test-merge5.out @ 3152:15d585dcdd1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: change filectx repr to use @ Avoids confusion with rev:nodeid syntax used elsewhere
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Sep 2006 16:43:21 -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