I want to get a high quality diff and I am not worried about how long it will take, e.g.
git merge --strategy-option=diff-algorithm=minimal develop
From the docs, Its not clear which one is best for which situations?
default, myers The basic greedy diff algorithm. Currently, this is the default.
minimal Spend extra time to make sure the smallest possible diff is produced.
patience Use "patience diff" algorithm when generating patches.
histogram This algorithm extends the patience algorithm to "support low-occurrence common elements".
There is a summary of the patience algorithm in another answer.
- Is the histogram algorithm always be better than the patience algorithm since it extends it?
- Is the minimal algorithm better than the default since it 'spends extra time'?
- Are
--strategy-option=patience
and--strategy-option=diff-algorithm=patience
equivalent?