mergetools / gvimdiff3on commit sequencer (rebase -i): respect strategy/strategy_opts settings (ca6c6b4)
   1. "$MERGE_TOOLS_DIR/vimdiff"