Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2738:ad4155e757da
Kill ui.setconfig_remoteopts
This brought too much knowledge about command line particulars into
the ui code. Moved to commands.py.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 31 Jul 2006 00:47:43 -0500 |
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)