mergetools / gvimdiff2on commit t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1 (db9476b)
   1. "$MERGE_TOOLS_DIR/vimdiff"