mergetools / gvimdiff2on commit Use simpler relative_path when set_git_dir (41894ae)
   1. "$MERGE_TOOLS_DIR/vimdiff"