Introduce the diff option '--patience'