mergetools / gvimdiff2on commit Merge branch 'rs/merge-add-strategies-simplification' (b32d7c5)
   1. "$MERGE_TOOLS_DIR/vimdiff"