From: Evan Broder <broder@mit.edu>
Date: Thu, 25 Dec 2008 04:33:25 +0000 (-0500)
Subject: Typo in catching blank lines.
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/commitdiff_plain/abbc5e9ccf467827545eb44f3603b6bc26bf0a14

Typo in catching blank lines.

svn path=/trunk/scripts/git-migration/; revision=1889
---

diff --git a/git-migrate b/git-migrate
index e61f380..65c7a12 100755
--- a/git-migrate
+++ b/git-migrate
@@ -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())