Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 1452:f1755621cb7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove now unused sortdiff and diff from mdiff
author Matt Mackall <mpm@selenic.com>
date Tue, 25 Oct 2005 22:17:31 -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)