projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e806c43 af77aee)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 17:36:49 +0000 (10:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 17:36:49 +0000 (10:36 -0700)
* maint:
  Fix a formatting error in git-merge.txt


Trivial merge
Git—the stupid content tracker