From 4ebd043f5398687854bd093879ff7fcc392f7f6d Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 7 Nov 2015 02:57:32 -0800 Subject: [PATCH] cmds: trivial cleanup Signed-off-by: David Aguilar --- cola/cmds.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cola/cmds.py b/cola/cmds.py index 8d9a6eee..b5818b34 100644 --- a/cola/cmds.py +++ b/cola/cmds.py @@ -910,10 +910,10 @@ class LoadFixupMessage(LoadCommitMessageFromSHA1): class Merge(Command): """Merge commits""" - def __init__(self, revision, no_commit, squash, noff, sign): + def __init__(self, revision, no_commit, squash, no_ff, sign): Command.__init__(self) self.revision = revision - self.no_ff = noff + self.no_ff = no_ff self.no_commit = no_commit self.squash = squash self.sign = sign -- 2.11.4.GIT