comparison tests/test-convert-cvs-detectmerge.t @ 15381:c519cd8f0169 stable

backout dbdb777502dc (issue3077) (issue3071) Using util.realpath turns out to create complex issues on both Mac and Windows. Back this change out for the release.
author Matt Mackall <mpm@selenic.com>
date Sat, 29 Oct 2011 11:02:23 -0500
parents 7698c275aa56
children 13d73bf6be29
comparison
equal deleted inserted replaced
15380:a53888685a6c 15381:c519cd8f0169