Mercurial > hg > pyhgsh
view tests/test-merge5.out @ 981:4f81068ed8cd
Merge with jeffpc
author | mpm@selenic.com |
---|---|
date | Sat, 20 Aug 2005 13:08:07 -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)