Hi Junio,
On Wed, 15 May 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> + test_path_is_file .git/MERGE_HEAD &&
> >> + test_path_is_file .git/MERGE_MODE &&
> >> + test_path_is_file .git/MERGE_MSG &&
> >> + test_path_is_file .git/MERGE_RR &&
> >
> > Isn't this a clear impleme
Johannes Schindelin writes:
>> +test_expect_success 'merge --quit' '
>> +git reset --hard c2 &&
>> +test_must_fail git -c rerere.enabled=true merge master &&
>
> This makes me really worried. It is the same `master` (i.e. *not* a tag)
> that broke this test case in the previous round.
I'
Nguyễn Thái Ngọc Duy writes:
> diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
> index 106148254d..d453710ef6 100755
> --- a/t/t7600-merge.sh
> +++ b/t/t7600-merge.sh
> @@ -822,4 +822,18 @@ test_expect_success EXECKEEPSPID 'killed merge can be
> completed with --continue'
> verify_parent
Hi Duy,
On Tue, 14 May 2019, Nguyễn Thái Ngọc Duy wrote:
> diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
> index 106148254d..d453710ef6 100755
> --- a/t/t7600-merge.sh
> +++ b/t/t7600-merge.sh
> @@ -822,4 +822,18 @@ test_expect_success EXECKEEPSPID 'killed merge can be
> completed with --cont
This allows to cancel the current merge without resetting worktree/index,
which is what --abort is for. Like other --quit(s), this is often used
when you forgot that you're in the middle of a merge and already
switched away, doing different things. By the time you've realized, you
can't even contin
5 matches
Mail list logo
