Mihai Capotă <mi...@mihaic.ro> writes: > Signed-off-by: Mihai Capotă <mi...@mihaic.ro> > ---
Thanks. It might be better to make it "which resulted in complex conflicts", though. > Documentation/git-pull.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt > index c975743..eec4c1d 100644 > --- a/Documentation/git-pull.txt > +++ b/Documentation/git-pull.txt > @@ -218,7 +218,7 @@ $ git merge origin/next > ------------------------------------------------ > > > -If you tried a pull which resulted in a complex conflicts and > +If you tried a pull which resulted in a complex conflict and > would want to start over, you can recover with 'git reset'. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
