diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-05 10:36:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-05 10:36:49 -0700 |
| commit | 31731b0ea4fccf5455ce367d483feaabdc411e0a (patch) | |
| tree | 02b100f4b59557e9b2eb0f1392de697e812c3aa1 /git-mergetool.sh | |
| parent | t0003: properly quote $HOME (diff) | |
| parent | Fix a formatting error in git-merge.txt (diff) | |
| download | tgif-31731b0ea4fccf5455ce367d483feaabdc411e0a.tar.xz | |
Merge branch 'maint'
* maint:
Fix a formatting error in git-merge.txt
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions