Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-ui-config.out @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:14:29 +0200 |
parents | 18cf95ad3666 |
children | 24c1db20990c |
line wrap: on
line source
[('bool1', 'true'), ('bool2', 'false'), ('string', 'string value')] [('list1', 'foo'), ('list2', 'foo bar baz'), ('list3', 'alice, bob'), ('list4', 'foo bar baz alice, bob')] --- 'string value' 'true' 'false' None --- Not a boolean: string value True False False False True --- ['foo'] ['foo', 'bar', 'baz'] ['alice', 'bob'] ['foo', 'bar', 'baz', 'alice', 'bob'] ['foo', 'bar', 'baz', 'alice', 'bob'] [] [] ['foo'] ['foo'] ['foo', 'bar'] ['foo', 'bar'] ['foo bar'] ['foo', 'bar'] ---