aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2009-10-25 13:43:08 +0100
committerGuido Günther <agx@sigxcpu.org>2009-10-25 13:45:15 +0100
commiteef5eca15f3c77df95d79322f62649ac429a8f35 (patch)
treed89242ec41a133d2294fb63e37dbd1d504af3433
parent4da84c0e458eaf9a1297adbeeddb85af7c9aed27 (diff)
Use "imported" instead of "merged".
This way we don't claim we merged something but we possibly didn't. Closes: #545908
-rwxr-xr-xgit-import-orig2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-import-orig b/git-import-orig
index 632edbf..6f7f896 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -342,7 +342,7 @@ on howto create it otherwise use --upstream-branch to specify it.
cleanup_tmp_tree(tmpdir)
if not ret:
- print "Succesfully merged version %s of %s into ." % (version, archive)
+ print "Succesfully imported version %s of %s" % (version, archive)
return ret
if __name__ == "__main__":