Mercurial > hg
view tests/test-merge5.out @ 2165:d821918e3bee
Use better names (hg-{usage}-{random}.{suffix}) for temporary files.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 30 Apr 2006 21:11:22 +0200 |
parents | 5c4496ed152d |
children | b2ae81a7df29 |
line wrap: on
line source
removing b this update spans a branch affecting the following files: b aborting update spanning branches! (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)