"Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > if $base_present > then > ... > + base_present=1 I think s/1/true/ or something is in order, perhaps? > + LOCAL='lo cal' > + BASE='ba se' > + REMOTE="' '" > + MERGED='mer ged' > + merge_tool_path=record_parameters > + > + merge_cmd vimdiff || at_least_one_ko=true > + > + cat >expect <<-\EOF > + -f > + -c > + echo | split | vertical split | 1b | wincmd l | vertical split | quit | wincmd l | 2b | wincmd j | 3b | tabdo windo diffthis > + -c > + tabfirst > + lo cal > + ' ' > + mer ged > + EOF > + > + diff -u expect actual || at_least_one_ko=true > + > if test "$at_least_one_ko" = "true" > then > return 255 > > base-commit: 980145f7470e20826ca22d7343494712eda9c81d
