Mercurial > public > mercurial-scm > hg

diff contrib/simplemerge @ 19022:cba222f01056

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: run check-code on Python files without .py extension
author Mads Kiilerich <madski@unity3d.com>
date Wed, 17 Apr 2013 03:39:36 +0200
parents 659f34b833b9
children 9de689d20230
line wrap: on
line diff
--- a/contrib/simplemerge	Tue Apr 16 21:14:50 2013 +0200
+++ b/contrib/simplemerge	Wed Apr 17 03:39:36 2013 +0200
@@ -44,7 +44,7 @@
 try:
     for fp in (sys.stdin, sys.stdout, sys.stderr):
         util.setbinary(fp)
-    
+
     opts = {}
     try:
         args = fancyopts.fancyopts(sys.argv[1:], options, opts)