diff options
Diffstat (limited to 'git-import-orig')
| -rwxr-xr-x | git-import-orig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-import-orig b/git-import-orig index a8e4d3c9..dc8d7e2c 100755 --- a/git-import-orig +++ b/git-import-orig @@ -382,7 +382,7 @@ on howto create it otherwise use --upstream-branch to specify it. try: gbpc.GitMerge(tag)() except gbpc.CommandExecFailed: - raise GbpError, """Merge failed, please resolve.""" % version + raise GbpError, """Merge failed, please resolve.""" if options.postimport: epoch = '' if os.access('debian/changelog', os.R_OK): |