Typo in catching blank lines.
authorEvan Broder <broder@mit.edu>
Thu, 25 Dec 2008 04:33:25 +0000 (23:33 -0500)
committerEvan Broder <broder@mit.edu>
Thu, 25 Dec 2008 04:33:25 +0000 (23:33 -0500)
svn path=/trunk/scripts/git-migration/; revision=1889

git-migrate

index e61f380..65c7a12 100755 (executable)
@@ -84,7 +84,7 @@ def mergeHistories():
     merges = []
     for line in open('merges'):
         line = line.strip()
-        if line[0] == '#' or line == '':
+        if line == '' or line[0] == '#':
             continue
         
         merges.append(line.split())