Mercurial > hg

view tests/test-merge5.out @ 1009:1bc619b12025

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't show the diff in hgeditor if there are no changes in file contents.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 22 Aug 2005 19:56:52 +0200
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)