commit bc62ede807f0ad3a920fa1e8b05dd90cc8f5f289
from: Stefan Sperling <stsp@stsp.name>
date: Fri Feb 26 17:31:35 2021 UTC

use Myers diff instead of Patience diff when merging files with diff3

Myers diff tends to divide files into smaller diff chunks, while Patience
diff attemps to maximize the size of diff chunks. Smaller diffs chunks
generally result in a more managable presentation of merge conflicts.

commit - 9f8221f0becb1dbf90fe65c44b02f9a247f7b957
commit + bc62ede807f0ad3a920fa1e8b05dd90cc8f5f289
blob - 837a0e0977d8c7fbd52ad7789978b0e57d7b1ebb
blob + 6343f4f287533c9a4793e0e93a169a6bc59a5d23
--- lib/diff3.c
+++ lib/diff3.c
@@ -223,7 +223,7 @@ diffreg(BUF **d, const char *path1, const char *path2)
 		goto done;
 
 	err = got_diffreg(&diffreg_result, f1, f2,
-	    GOT_DIFF_ALGORITHM_PATIENCE, 0, 1);
+	    GOT_DIFF_ALGORITHM_MYERS, 0, 1);
 	if (err)
 		goto done;