xdiff: PATIENCE/HISTOGRAM are not independent option bits