mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-26 20:12:44 +00:00
parent
71fa171c64
commit
f10f288faf
@ -383,7 +383,6 @@ merge(int m1, int m2)
|
||||
change(3, &d1->new, false);
|
||||
} else if (eflag == EFLAG_OVERLAP) {
|
||||
j = edit(d2, dup, j, DIFF_TYPE1);
|
||||
printdiff(d2);
|
||||
}
|
||||
d1++;
|
||||
continue;
|
||||
|
Loading…
Reference in New Issue
Block a user