mergetools / gvimdiff2on commit Merge branch 'jk/push-deadlock-regression-fix' (d6857a8)
   1. "$MERGE_TOOLS_DIR/vimdiff"