[meld] Fix multiple and three-way syncpoints
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Fix multiple and three-way syncpoints
- Date: Sun, 21 Jul 2013 00:47:53 +0000 (UTC)
commit 61eab5c59cf05a6a415c55bffb530901ceda074a
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Jul 21 10:46:03 2013 +1000
Fix multiple and three-way syncpoints
meld/diffutil.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/diffutil.py b/meld/diffutil.py
index d1b7106..b393a57 100644
--- a/meld/diffutil.py
+++ b/meld/diffutil.py
@@ -458,7 +458,7 @@ class Differ(gobject.GObject):
for i in range(self.num_sequences - 1):
if self.syncpoints:
- syncpoints = [(s[0](), s[1]()) for s in self.syncpoints[i]]
+ syncpoints = [(s[i][0](), s[i][1]()) for s in self.syncpoints]
matcher = self._sync_matcher(None,
sequences[1], sequences[i * 2],
syncpoints=syncpoints)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]