mergetools / gvimdiff2on commit Merge branch 'nd/remote-update-doc' (643a9ea)
   1. "$MERGE_TOOLS_DIR/vimdiff"