diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:10:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:10:23 -0700 |
| commit | 23242a6f9e838013fbfddd4e8eb023d8c9328d37 (patch) | |
| tree | 2185ffc6becaf4da9a6fefe10db1f61979872f33 /builtin | |
| parent | ee7a83f6314a6fe281c8e3e041cfd42b5a2deb44 (diff) | |
| parent | f8750a0ea951a328481b67b5d0558c0402f0cdfd (diff) | |
| download | git-23242a6f9e838013fbfddd4e8eb023d8c9328d37.tar.gz git-23242a6f9e838013fbfddd4e8eb023d8c9328d37.tar.xz | |
Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
* jc/maint-mergetool-style-fix:
mergetool: style fixes
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions