diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-11 22:05:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-11 22:05:58 -0700 |
| commit | 3499cb1ae7b97ce8f67879156e2014e31dd985b6 (patch) | |
| tree | 7985807d8eb0936df801616e76ba63578731745a /git-mergetool.sh | |
| parent | 7d82b06d2be1b872a1debf79fadf0585afc70b69 (diff) | |
| parent | 0d4dbcd35e89a549055e34daf410e4579571b984 (diff) | |
| download | git-3499cb1ae7b97ce8f67879156e2014e31dd985b6.tar.gz git-3499cb1ae7b97ce8f67879156e2014e31dd985b6.tar.xz | |
Merge branch 'maint'
* maint:
t/README: document --root option
Makefile: default pager on AIX to "more"
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions