mergetools / gvimdiff2on commit Merge branch 'nd/reject-empty-shallow-request' (208ee59)
   1. "$MERGE_TOOLS_DIR/vimdiff"