projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f64a5a 1e501a7)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Nov 2011 22:30:45 +0000 (14:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Nov 2011 22:30:45 +0000 (14:30 -0800)
* maint:
  documentation fix: git difftool uses diff tools, not merge tools.


Trivial merge
Git—the stupid content tracker