From 91598dd06278fce1df97f97f351ac642241c8c2e Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Fri, 12 Oct 2012 17:13:38 +1000 Subject: [PATCH 03/11] Fix broken commit --- meld/dirdiff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld/dirdiff.py b/meld/dirdiff.py index 74c0bcf..88c8365 100644 --- a/meld/dirdiff.py +++ b/meld/dirdiff.py @@ -196,7 +196,7 @@ class CanonicalListing(object): for s in seq: if s: return s - filled = lambda seq: tuple([s or first(seq) for s in seq]) + filled = lambda seq: tuple([s or first_nonempty(seq) for s in seq]) return sorted([filled(v) for v in self.items.itervalues()]) -- 1.7.10.4