From b09f973906667d7b6bca6b4fe761051512f6dfa7 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 6 May 2013 10:32:58 +0200 Subject: [PATCH] Remove unused local variable. --- git-imerge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-imerge b/git-imerge index d68059e..a238e8c 100755 --- a/git-imerge +++ b/git-imerge @@ -1880,7 +1880,7 @@ def request_user_merge(merge_state, i1, i2): '-m', 'Merge %d-%d of incremental merge \'%s\'' % (i1, i2, merge_state.name,), left.sha1, ]) - except CalledProcessError, e: + except CalledProcessError: # We expect an error (otherwise we would have automerged!) pass sys.stdout.write('Original first commit:\n')