diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-05 12:37:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 12:37:24 -0700 |
| commit | f0df1293acdba9513cae17e2c63b4169f1347371 (patch) | |
| tree | e4d9309caa37b13a21ad38147833ed7ee29479bd /contrib | |
| parent | 46068383aa825dfe9026f9255cea07da07e06253 (diff) | |
| parent | e77095e8b8d541b41c242aa6dbc8319cb99def5e (diff) | |
| download | git-f0df1293acdba9513cae17e2c63b4169f1347371.tar.gz | |
Merge branch 'maint-1.6.3' into maint
* maint-1.6.3:
Better usage string for reflog.
hg-to-git: don't import the unused popen2 module
send-email: remove debug trace
config: Keep inner whitespace verbatim
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/hg-to-git/hg-to-git.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py index 7b03204ed1..2a6839d81e 100755 --- a/contrib/hg-to-git/hg-to-git.py +++ b/contrib/hg-to-git/hg-to-git.py @@ -20,7 +20,7 @@ """ import os, os.path, sys -import tempfile, popen2, pickle, getopt +import tempfile, pickle, getopt import re # Maps hg version -> git version |