Mercurial > hg

view tests/test-merge5.out @ 1992:ea8345a7a29d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include templates/static/* in MANIFEST.in so that distutils setup will include them.
author Lee Cantey <lcantey@gmail.com>
date Fri, 24 Mar 2006 08:27:24 +0100
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)