diffs can now be checked off to be "used", pressing "merge" button at bottom creates result.
diffs that edit the same line will be applied from biggest starting line to smallest start line, overwriting predecessors. Diffs that start on the same line will be applied non-deterministically.
"last line" (150) issue with diffs resolved.
"crazy tabs" (33) issue not resolved.
diffs now do not show if there were no changes
diffs can now be checked off to be "used", pressing "merge" button at bottom creates result.
diffs that edit the same line will be applied from biggest starting line to smallest start line, overwriting predecessors. Diffs that start on the same line will be applied non-deterministically.