mergetools / gvimdiff3on commit general UI improvements (05293f9)
   1. "$MERGE_TOOLS_DIR/vimdiff"