Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3460:2d35a8d2b32d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: return list of modified files even when an exception is raised The file list is passed in as an argument and updated in place. This fixes issue399.
author Brendan Cully <brendan@kublai.com>
date Wed, 18 Oct 2006 10:37:34 -0700
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