mergetools / gvimdiff2on commit Merge branch 'ak/t4151-ls-files-could-be-empty' into maint (e8c7b8c)
   1. "$MERGE_TOOLS_DIR/vimdiff"