diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-05 12:37:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 12:37:40 -0700 |
| commit | c39e9eb3df18c34330d50ebfae28b42880d9a4cc (patch) | |
| tree | e401088b387f87c81127c707e381d61176905226 /contrib/hg-to-git/hg-to-git.py | |
| parent | f621a8454d19d17fe46e6951b7e3d22bebd92aba (diff) | |
| parent | f0df1293acdba9513cae17e2c63b4169f1347371 (diff) | |
| download | git-c39e9eb3df18c34330d50ebfae28b42880d9a4cc.tar.gz | |
Merge branch 'maint'
* maint:
gitweb/README: Document $base_url
Documentation: git submodule: add missing options to synopsis
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/hg-to-git/hg-to-git.py')
| -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 |