Mercurial > public > mercurial-scm > hg

diff tests/test-simplemerge-cmd @ 8448:0eb8c4df61bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: renamed helper to avoid clash with stdlib repr module
author Martin Geisler <mg@lazybytes.net>
date Sun, 17 May 2009 02:31:12 +0200
parents e1f4343db740
children
line wrap: on
line diff
--- a/tests/test-simplemerge-cmd	Sun May 17 01:24:45 2009 +0200
+++ b/tests/test-simplemerge-cmd	Sun May 17 02:31:12 2009 +0200
@@ -47,7 +47,7 @@
 python simplemerge -p binary-local base other
 
 echo '% binary file --text'
-python simplemerge -a -p binary-local base other 2>&1 | $TESTDIR/repr.py
+python simplemerge -a -p binary-local base other 2>&1 | $TESTDIR/printrepr.py
 
 echo '% help'
 python simplemerge --help