tests/legacy-encoding.hg
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 11 Dec 2006 18:09:52 +0100
changeset 3869 ad6f34c83c3d
parent 3839 3820385fb113
permissions -rw-r--r--
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3839
3820385fb113 Fixes test-encoding for python2.3 and minor cleanups:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3835
diff changeset
     1
(binary:application/octet-stream)