tests/test-conflict.out

Redo local clone hgrc fix

We shouldn't copy hgrc on a local clone, nor localtags. Behavior
should be identical to a remote clone.

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a