mergetools / vimdiff2on commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1. "$MERGE_TOOLS_DIR/vimdiff"