mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-11-13 07:41:04 +03:00
Code Issues Projects Releases Wiki Activity

Remove unused local variable.

Browse Source
This commit is contained in:
Michael Haggerty 2013-05-06 10:32:58 +02:00
parent b1a5e7cd1d
commit b09f973906
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-imerge
View File

@ -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')