Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 2699:f8bcaf5696d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: strip should not blow away local changes This changes the mq strip command to abort if there are any changes in the working directory.
author Chris Mason <mason@suse.com>
date Thu, 27 Jul 2006 09:27:45 -0700
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)