Re: [PATCH] Fixed typo in git-pull manual

2013-03-27 Thread Junio C Hamano
Mihai Capotă writes: > Signed-off-by: Mihai Capotă > --- 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/gi

[PATCH] Fixed typo in git-pull manual

2013-03-27 Thread Mihai Capotă
Signed-off-by: Mihai Capotă --- 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,