Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 1508:b254243b7159

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix a warning when py2exe is not used
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 04 Nov 2005 11:37:45 -0800
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)