mergetools / gvimdiff2on commit commit: move post-rewrite code to libgit (a87a6f3)
   1. "$MERGE_TOOLS_DIR/vimdiff"