Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1434:696851b1bba9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix use of diff(1) triggered by set -e. Search harder for a decent diff/patch to use.
author levon@movementarian.org
date Mon, 24 Oct 2005 14:55:53 -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)