From b3f00063618949604969100a17255ed99f2f5851 Mon Sep 17 00:00:00 2001 From: Nathan W. Panike Date: Fri, 29 Oct 2010 10:33:54 -0500 Subject: 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 Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano (cherry picked from commit af77aee9cac51c2036e6019b4aebec2049f03e6b) Signed-off-by: Jonathan Nieder --- Documentation/git-merge.txt | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 84043cc..d43416d 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -59,13 +59,13 @@ include::merge-options.txt[] -m :: Set the commit message to be used for the merge commit (in case one is created). - - If `--log` is specified, a shortlog of the commits being merged - will be appended to the specified message. - - The 'git fmt-merge-msg' command can be - used to give a good default for automated 'git merge' - invocations. ++ +If `--log` is specified, a shortlog of the commits being merged +will be appended to the specified message. ++ +The 'git fmt-merge-msg' command can be +used to give a good default for automated 'git merge' +invocations. --rerere-autoupdate:: --no-rerere-autoupdate:: -- 1.7.2.3.557.gab647.dirty