From abbc5e9ccf467827545eb44f3603b6bc26bf0a14 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Wed, 24 Dec 2008 23:33:25 -0500 Subject: [PATCH] Typo in catching blank lines. svn path=/trunk/scripts/git-migration/; revision=1889 --- git-migrate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()) -- 1.7.9.5