Web lists-archives.com

Re: [PATCH 1/3] Add --gui option to mergetool




Hi,

Denton Liu <liu.denton@xxxxxxxxx> writes:
> [...]
>
> +test_expect_success 'gui mergetool' '
> +	test_when_finished "git reset --hard" &&
> +	test_when_finished "git config merge.tool mytool" &&
> +	test_when_finished "git config --unset merge.guitool" &&
> +	git config merge.tool badtool &&
> +	git config merge.guitool mytool &&

You should be able to squash the lines
  `test_when_finished "git config --unset merge.guitool" &&`
and
  `git config merge.guitool mytool &&`
into
  `test_config merge.guitool mytool`

(It is however not possible with merge.tool since you set it to a
specific value 'when_finished')

Thanks,
Rémi