projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee7a83f f8750a0)
Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:10:23 +0000 (11:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:10:23 +0000 (11:10 -0700)
* jc/maint-mergetool-style-fix:
  mergetool: style fixes


Trivial merge
Git—the stupid content tracker