diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-09 22:41:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-09 22:41:27 -0800 |
| commit | 5363d0744e7360beee990d3c2a8c1eb64a23071e (patch) | |
| tree | c533c7ab0c236fa5b621c5aaddb7aed3e734bae1 /git-mergetool.sh | |
| parent | 3aa1f7ca3779f73164b285c070b71abcdd7397c1 (diff) | |
| parent | aa971cb9bf4105eefb435b9e6f282f019529c35f (diff) | |
| download | git-5363d0744e7360beee990d3c2a8c1eb64a23071e.tar.gz | |
Merge branch 'maint'
* maint:
work around Python warnings from AsciiDoc
git-svn: Make following parents atomic
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions