diff options
| author | Nathan W. Panike <nathan.panike@gmail.com> | 2010-10-29 15:33:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-29 17:16:35 (GMT) |
| commit | af77aee9cac51c2036e6019b4aebec2049f03e6b (patch) | |
| tree | f9245a7936e98fc85fc7e1fac60c017474021b65 /blob.c | |
| parent | c3fced64981e3d2700d83c0a6661ac347df5121e (diff) | |
| download | git-af77aee9cac51c2036e6019b4aebec2049f03e6b.zip git-af77aee9cac51c2036e6019b4aebec2049f03e6b.tar.gz git-af77aee9cac51c2036e6019b4aebec2049f03e6b.tar.bz2 | |
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>
Diffstat (limited to 'blob.c')
0 files changed, 0 insertions, 0 deletions