From: Nathan W. Panike <nathan.panike@gmail.com>
Date: Fri, 29 Oct 2010 15:33:54 +0000 (-0500)
Subject: Fix a formatting error in git-merge.txt
X-Git-Tag: v1.7.3.3~44
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/af77aee9cac51c2036e6019b4aebec2049f03e6b?ds=inline;hp=af77aee9cac51c2036e6019b4aebec2049f03e6b

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>
---