diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-06 16:11:34 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-06 16:11:34 +0100 |
| commit | 56e942318f3c493c8dcd4759f806034331ebeda5 (patch) | |
| tree | 82cdca65cd197f36ea3680171186e0ddcf234266 /git/test/fixtures | |
| parent | d46e3fe9cb0dea2617cd9231d29bf6919b0f1e91 (diff) | |
| parent | 68f8a43d1b643318732f30ee1cd75e1d315a4537 (diff) | |
| download | GitPython-56e942318f3c493c8dcd4759f806034331ebeda5.tar.gz GitPython-56e942318f3c493c8dcd4759f806034331ebeda5.zip | |
Merge branch 'py3' into 0.3
Conflicts:
git/refs/log.py
Diffstat (limited to 'git/test/fixtures')
| -rw-r--r-- | git/test/fixtures/git_config_global | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git/test/fixtures/git_config_global b/git/test/fixtures/git_config_global index 1a55397f..56fbd3b3 100644 --- a/git/test/fixtures/git_config_global +++ b/git/test/fixtures/git_config_global @@ -1,3 +1,4 @@ +# just a comment [alias] st = status ci = commit |