![[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) | ||
| commit | 31731b0ea4fccf5455ce367d483feaabdc411e0a | |
| tree | 02b100f4b59557e9b2eb0f1392de697e812c3aa1 | tree | snapshot |
| parent | e806c43537e2e9b5ab96d03b777a5759ef57b13d | commit | diff |
| parent | af77aee9cac51c2036e6019b4aebec2049f03e6b | commit | diff |
Merge branch 'maint'
* maint:
Fix a formatting error in git-merge.txt
* maint:
Fix a formatting error in git-merge.txt