Mercurial > repos > bornea > merge_scaffold

diff MergeFilesWrapper.py @ 9:abe608eb4aa4 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author bornea
date Wed, 03 Aug 2016 15:15:54 -0400
parents 33a9aff96cb3
children 4882e93ede2d
line wrap: on
line diff
--- a/MergeFilesWrapper.py	Wed Aug 03 15:14:31 2016 -0400
+++ b/MergeFilesWrapper.py	Wed Aug 03 15:15:54 2016 -0400
@@ -8,4 +8,4 @@
 outfile = sys.argv[5] # output filename
 ins_path = sys.argv[6]
 
-cmd = r"python " + str(ins_path) + " " + str(infile1) + " " + str(infile2) + " " + str(infile3) + " " + str(baitfile) + " " str(outfile)
+cmd = r"python " + str(ins_path) + " " + str(infile1) + " " + str(infile2) + " " + str(infile3) + " " + str(baitfile) + " " + str(outfile)