Aw: Re: [PATCH 07/13] Improve description in How to merge

2013-08-25 Thread Thomas Ackermann
Hm. It's been too long since I was a novice, since I find the above clear already. OK; I will drop that patch. --- Thomas -- 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

[PATCH 07/13] Improve description in How to merge

2013-08-24 Thread Thomas Ackermann
Describe the conflict resolution in terms of the commands the user is supposed to use. Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation/user-manual.txt

Re: [PATCH 07/13] Improve description in How to merge

2013-08-24 Thread Junio C Hamano
Thomas Ackermann th.ac...@arcor.de writes: Describe the conflict resolution in terms of the commands the user is supposed to use. Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git

Re: [PATCH 07/13] Improve description in How to merge

2013-08-24 Thread Jonathan Nieder
Thomas Ackermann wrote: Describe the conflict resolution in terms of the commands the user is supposed to use. [...] --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1251,10 +1251,8 @@ Automatic merge failed; fix conflicts and then commit the result.