mergetools / gvimdiff3on commit Merge branch 'ah/filter-branch-setup' (5779a4a)
   1. "$MERGE_TOOLS_DIR/vimdiff"