This will make it easier to use setup_tool in places where we expect
that the selected tool will not support the current mode.
Signed-off-by: John Keeping j...@keeping.me.uk
---
git-mergetool--lib.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-mergetool--lib.sh
Applying this one on top of 1/7 thru 5/7 and 7/7 seems to break
t7610 rather badly.
--- 8 -- 8 -- 8 -- 8 -- 8 -- 8 ---
...
ok 1 - setup
expecting success:
git checkout -b test1 branch1
git submodule update -N
test_must_fail git merge master /dev/null 21
(
On Fri, Jan 25, 2013 at 4:24 PM, Junio C Hamano gits...@pobox.com wrote:
Applying this one on top of 1/7 thru 5/7 and 7/7 seems to break
t7610 rather badly.
I just sent a replacement for the vim/symlink issue stuff.
I tried to keep the patch small. John, can you rebase this
patch on top of it?
3 matches
Mail list logo
