mergetools / gvimdiff2on commit Merge branch 'jk/filter-branch-come-back-to-original' (9a11f13)
   1. "$MERGE_TOOLS_DIR/vimdiff"