mergetools / vimdiff3on commit cherry-pick: allow to pick to unborn branches (0f974e2)
   1. "$MERGE_TOOLS_DIR/vimdiff"