mergetools / gvimdiff2on commit Merge branch 'jk/apache-test-for-2.4' (23983a4)
   1. "$MERGE_TOOLS_DIR/vimdiff"