mergetools / gvimdiff2on commit Merge branch 'rs/refresh-beyond-symlink' (a75e759)
   1. "$MERGE_TOOLS_DIR/vimdiff"