![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Nathan W. Panike <nathan.panike@gmail.com> | |
| Fri, 29 Oct 2010 15:33:54 +0000 (10:33 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 Oct 2010 17:16:35 +0000 (10:16 -0700) | ||
| commit | af77aee9cac51c2036e6019b4aebec2049f03e6b | |
| tree | f9245a7936e98fc85fc7e1fac60c017474021b65 | tree | snapshot |
| parent | c3fced64981e3d2700d83c0a6661ac347df5121e | commit | diff |
Fix a formatting error in git-merge.txt
Inside an element of an enumerated list, the second and subsequent
paragraphs need to lose their indent and have to be strung together with a
line with a single '+' on it instead. Otherwise the lines below are shown
in typewriter face, which just looks wrong.
Signed-off-by: Nathan W. Panike <nathan.panike@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Inside an element of an enumerated list, the second and subsequent
paragraphs need to lose their indent and have to be strung together with a
line with a single '+' on it instead. Otherwise the lines below are shown
in typewriter face, which just looks wrong.
Signed-off-by: Nathan W. Panike <nathan.panike@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge.txt | diff | blob | history |