Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1190:737f9b90c571

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make import command reject patches that resemble email messages. See changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e for an example of why this is a good idea.
author bos@serpentine.internal.keyresearch.com
date Thu, 01 Sep 2005 09:04:18 -0700
parents 5a034646e472
children ced2d3620f95
line wrap: on
line source

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)