As spotted by the eagle eyes of Jeff King. Signed-off-by: Wincent Colaiuta <win@xxxxxxxxxxx> --- Documentation/git-merge.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 427ad90..c04ae73 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -40,7 +40,7 @@ include::merge-options.txt[] include::merge-strategies.txt[] -If you tried a merge which resulted in a complex conflicts and +If you tried a merge which resulted in complex conflicts and want to start over, you can recover with 'git-reset'. CONFIGURATION -- 1.6.2.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
