mergetools / gvimdiff3on commit Merge branch 'jh/filter-empty-contents' (152722f)
   1. "$MERGE_TOOLS_DIR/vimdiff"