tests/test-ui-config.py.out

prepush: add more precise error messages

Part of the patch is from [e-mail]

- indicate the branch name where there are multiple heads
- give better advice when hitting a possible race, where new heads are added
  between discovery and the call to branchmap(). In that case, asking the user
  to merge isn't helpful, since only remote has the changes.

[('string', 'string value'), ('bool1', 'true'), ('bool2', 'false')]
[('list1', 'foo'), ('list2', 'foo bar baz'), ('list3', 'alice, bob'), ('list4', 'foo bar baz alice, bob')]
---
'string value'
'true'
'false'
None
---
values.string 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']
None
True