![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Nov 2010 17:36:49 +0000 (10:36 -0700) | ||
| committer | Junio 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
Fix a formatting error in git-merge.txt
Trivial merge