diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-04-21 12:12:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-21 12:12:19 -0700 |
| commit | e8281f01642fe17d6f44b3b18ed333b322770e81 (patch) | |
| tree | 89fbe25a6ad7bf93ee80a99c55e8bc95057f559b /git-mergetool.sh | |
| parent | Merge branch 'jk/pack-corruption-post-mortem' into maint (diff) | |
| parent | CodingGuidelines: update 'rough' rule count (diff) | |
| download | tgif-e8281f01642fe17d6f44b3b18ed333b322770e81.tar.xz | |
Merge branch 'jg/cguide-we-cannot-count' into maint
* jg/cguide-we-cannot-count:
CodingGuidelines: update 'rough' rule count
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions