mergetools / gvimdiff2on commit checkout: prevent losing staged changes with --merge (6eff409)
   1. "$MERGE_TOOLS_DIR/vimdiff"