Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>I think there are multiple algorithms supported because none of the algorithms are clearly the best choice in all cases.</p> <p>The differences are in readability of the patch output and processing time needed to generate the patch.</p> <p>Summarizing, this is what I understand the differences are:</p> <ul> <li>Myers: The original algorithm as implemented in xdiff (<a href="http://www.xmailserver.org/xdiff-lib.html" rel="noreferrer">http://www.xmailserver.org/xdiff-lib.html</a> and <a href="http://www.xmailserver.org/diff2.pdf" rel="noreferrer">http://www.xmailserver.org/diff2.pdf</a>), optimizing the 'edit distance' for changed lines.</li> <li>Minimal: Myers plus trying to minimize the patch size.</li> <li>Patience: Attempts to trade readability of the patch versus patch size and processing time. See <a href="https://stackoverflow.com/questions/4045017/what-is-git-diff-patience-for">What is `git diff --patience` for?</a> and <a href="http://bramcohen.livejournal.com/73318.html" rel="noreferrer">http://bramcohen.livejournal.com/73318.html</a> or <a href="http://alfedenzo.livejournal.com/170301.html" rel="noreferrer">http://alfedenzo.livejournal.com/170301.html</a> for a description.</li> <li>Histogram: Mainly created for speed. Faster than Myers and Patience, originally developed in jgit (<a href="http://eclipse.org/jgit/" rel="noreferrer">http://eclipse.org/jgit/</a>)</li> </ul> <p>Here is a comparison of speed for Myers, patience, and histogram: <a href="http://marc.info/?l=git&amp;m=133103975225142&amp;w=2" rel="noreferrer">http://marc.info/?l=git&amp;m=133103975225142&amp;w=2</a></p> <p>Here is a comparison of diff output of Histogram vs Myers: <a href="http://marc.info/?l=git&amp;m=138023003519837&amp;w=2" rel="noreferrer">http://marc.info/?l=git&amp;m=138023003519837&amp;w=2</a></p>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload