mergetools / gvimdiff2on commit Merge branch 'mm/push-force-is-dangerous' (14c6ee9)
   1. "$MERGE_TOOLS_DIR/vimdiff"