Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 1471:f56f38a1a85f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rewrote changes function in dirstate to use generic walk code now, file with unsupported type will not show up in status anymore
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 27 Oct 2005 13:29:35 -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)