On 08/03/15 11:06, Junio C Hamano wrote:
Anton Trunov anton.a.tru...@gmail.com writes:
On 04/03/15 23:01, Junio C Hamano wrote:
My apologies for pushing this topic, but what would you recommend?
Should we treat both sides line-wise or should we correct the documentation?
My gut feeling
On 04/03/15 23:01, Junio C Hamano wrote:
[]
My apologies for pushing this topic, but what would you recommend?
Should we treat both sides line-wise or should we correct the documentation?
Current version for git help merge:
...
ignore-space-change, ignore-all-space, ignore-space-at-eol
On 04/03/15 23:01, Junio C Hamano wrote:
Anton Trunov anton.a.tru...@gmail.com writes:
For the code version before applying this patch the following scenario
will take place if git merge -Xignore-all-space remote gets executed.
base file:
1st line
2nd line
master file:
1st line
On 03/03/15 23:32, Junio C Hamano wrote:
Anton Trunov anton.a.tru...@gmail.com writes:
The git-merge manual says that the ignore-space-change,
ignore-all-space, ignore-space-at-eol options preserve our version
if their version only introduces whitespace changes to a line.
So far
On 03/03/15 23:17, Torsten Bögershausen wrote:
On 2015-03-03 18.37, Anton Trunov wrote:
[]
Signed-off-by: Anton Trunov anton.a.trunov at gmail.com
Should we use the real email here (with the '@') ?
Didn't realize the parser for the web version mangles emails.
Will use the real email
On 04/03/15 10:07, Eric Sunshine wrote:
On Tue, Mar 3, 2015 at 3:17 PM, Torsten Bögershausen tbo...@web.de wrote:
On 2015-03-03 18.37, Anton Trunov wrote:
[]
Signed-off-by: Anton Trunov anton.a.trunov at gmail.com
Should we use the real email here (with the '@') ?
---
diff --git a/t/t3032
.
This commit fixes merge behavior in this case by checking
change for their version first.
Signed-off-by: Anton Trunov anton.a.trunov at gmail.com
---
t/t3032-merge-recursive-options.sh | 43 ++
xdiff/xmerge.c | 10 -
2 files changed, 48
7 matches
Mail list logo
