Mercurial > hg

view tests/test-merge5.out @ 3074:be98c5ce4022

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: do not shell-quote options to new commands revert a change introduced by 453097750fbf
author TK Soh <teekaysoh@yahoo.com>
date Mon, 28 Aug 2006 16:30:48 -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