mergetools / gvimdiff2on commit Merge branch 'vn/xmmap-gently' (e13966d)
   1. "$MERGE_TOOLS_DIR/vimdiff"