mergetools / gvimdiff2on commit Merge branch 'jk/tests-cleanup' (ad4d891)
   1. "$MERGE_TOOLS_DIR/vimdiff"