| commit | 4052719f6dde13c85ddb2f25ee647506bdc7868b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Sep 2012 22:54:25 +0000 (3 15:54 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Sep 2012 22:54:25 +0000 (3 15:54 -0700) | ||
| tree | b7231e1c47ff58ef6a68f7b933058ad395afa380 | treesnapshot (tar.gz zip) |
| parent | 81dbbf72406c47b5199a59c6b83338b11fd3e754 | commitdiff |
| parent | f8750a0ea951a328481b67b5d0558c0402f0cdfd | commitdiff |
Merge branch 'jc/maint-mergetool-style-fix'
* jc/maint-mergetool-style-fix:
mergetool: style fixes
* jc/maint-mergetool-style-fix:
mergetool: style fixes