Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2743:a31f0f2997e9
import: switch from application/x-patch to text/x-diff
christian ebert says his mailer was broken.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Mon, 31 Jul 2006 12:02:13 -0700 |
parents | b2ae81a7df29 |
children | 49988d9f0758 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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)