From: "Torsten Bögershausen" <tboegi@web.de>
To: Anton Trunov <anton.a.trunov@gmail.com>, git@vger.kernel.org
Cc: jrnieder@gmail.com, charles@hashpling.org, Johannes.Schindelin@gmx.de
Subject: Re: [PATCH] xmerge.c: fix xdl_merge to conform with the manual
Date: Tue, 03 Mar 2015 21:17:33 +0100 [thread overview]
Message-ID: <54F616DD.8040904@web.de> (raw)
In-Reply-To: <1425404233-89907-1-git-send-email-anton.a.trunov@gmail.com>
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 '@') ?
> ---
> t/t3032-merge-recursive-options.sh | 43 ++++++++++++++++++++++++++++++++++++++
> xdiff/xmerge.c | 10 ++++-----
> 2 files changed, 48 insertions(+), 5 deletions(-)
>
> diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
> index 4029c9c..4cbedb4 100755
> --- a/t/t3032-merge-recursive-options.sh
> +++ b/t/t3032-merge-recursive-options.sh
> @@ -204,4 +204,47 @@ test_expect_success '--ignore-space-at-eol' '
> test_cmp expected actual
> '
>
> +# Setup for automerging with whitespace-only changes
> +# on both sides and in *all* lines
> +
> +test_expect_success 'setup: w/s only changes in all lines on both sides' '
> + git rm -rf . &&
> + git clean -fdqx &&
> + rm -rf .git &&
> + git init
missing &&
> +
> + echo " two words" >text.txt &&
> + git add text.txt &&
> + test_tick &&
> + git commit -m "Initial revision" &&
> +
> + git checkout -b remote &&
> + echo " \t\ttwo words " >text.txt &&
> + git commit -a -m "remote: insert whitespace only" &&
> +
> + git checkout master &&
> + echo " two words" >text.txt &&
> + git commit -a -m "master: insert whitespace only"
> +'
> +
> +test_expect_success 'w/s only in all lines: --ignore-space-change preserves ours' '
[]
next prev parent reply other threads:[~2015-03-03 20:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-03 17:37 [PATCH] xmerge.c: fix xdl_merge to conform with the manual Anton Trunov
2015-03-03 20:17 ` Torsten Bögershausen [this message]
2015-03-04 7:07 ` Eric Sunshine
2015-03-04 9:55 ` Anton Trunov
2015-03-04 10:01 ` Eric Sunshine
2015-03-04 9:59 ` Anton Trunov
2015-03-03 20:32 ` Junio C Hamano
2015-03-04 9:43 ` Anton Trunov
2015-03-04 20:01 ` Junio C Hamano
2015-03-05 9:50 ` Anton Trunov
2015-03-06 8:02 ` Anton Trunov
2015-03-08 8:06 ` Junio C Hamano
2015-03-09 10:07 ` Anton Trunov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54F616DD.8040904@web.de \
--to=tboegi@web.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=anton.a.trunov@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).