mergetools / gvimdiff2on commit Merge branch 'dm/run-command-ignored-hook-advise' (130b512)
   1. "$MERGE_TOOLS_DIR/vimdiff"