Aw: Re: [PATCH 09/13] Improve section Merge multiple trees

2013-08-25 Thread Thomas Ackermann
Maybe the intent is Git can help you perform a three-way merge, which can in turn be used for a many-way merge by repeating the merge procedure several times. The usual situation is that you only do one three-way merge (reconciling two lines of history) and commit

Re: Re: [PATCH 09/13] Improve section Merge multiple trees

2013-08-25 Thread Jonathan Nieder
Thomas Ackermann wrote: Maybe the intent is Git can help you perform a three-way merge, which can in turn be [...] If you don't mind I will use your text No problem. Signed-off-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the

[PATCH 09/13] Improve section Merge multiple trees

2013-08-24 Thread Thomas Ackermann
Remove unnecessary quoting. Simplify description of three-way merge. Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/user-manual.txt

Re: [PATCH 09/13] Improve section Merge multiple trees

2013-08-24 Thread Jonathan Nieder
Thomas Ackermann wrote: --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -3992,16 +3992,16 @@ Merging multiple trees Git helps you do a three-way merge, which you can expand to n-way by repeating the merge procedure arbitrary times until you finally -commit