diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:07:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:07:49 -0800 |
| commit | c34ba9967c0cf882bbdaf87bd72fa84e0ef099ed (patch) | |
| tree | 2430bc763807d3814a84982facfee80608c75022 /git-mergetool--lib.sh | |
| parent | 1e501a7c47ad5ada53d3b1acfb9f131f76e969ec (diff) | |
| parent | c2857fb8b7903b2bba9217310971e5282549174d (diff) | |
| download | git-c34ba9967c0cf882bbdaf87bd72fa84e0ef099ed.tar.gz | |
Merge branch 'maint-1.7.6' into maint-1.7.7
* maint-1.7.6:
stripspace: fix outdated comment
Add MYMETA.yml to perl/.gitignore
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions