Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2163:278f9b13c39a
SunOS fix: Replaced $PWD with `pwd`
under certain conditioins $PWD isn't up to date,
observed on SunOS 5.8
author | Sascha Wilde <wilde@sha-bang.de> |
---|---|
date | Sun, 30 Apr 2006 19:29:57 +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)