4 years ago Stefan Sperling
show original file content in conflict markers
improve use of mixed size_t/off_t types in diff3.c's edscript()
diff3.c: do not use the same variables for both line numbers and byte offsets
diff3.c's skip() returns number of bytes skipped so switch from int to size_t
remove worklist code; it was only used to unlink files which we already unlink
diff3.c: check for unlink errors and unlink dp13 and dp23 again
rename local variable in diff3.c's edscript() from j to len (not a loop index)
rename local variable in diff3.c's skip() from j to len (not a loop index)
remove pointless attempt of unlinking temporary file name template paths
do not leak open file in diff3.c's readin() error paths
do not abuse d3s->fp[0] as a local variable in diff3.c's readin()
remove unused 'pr' argument from diff3.c's skip() function
more mechanical conversions to struct got_error: buf_load() and buf_alloc()
some whitespace fixes in diff3.c
check for errors from buf_append() in diff3.c's diff_output()
remove pointless debug code from diff3.c
eflag in diff3.c is hard-coded to 3; remove code for other cases
check for errors from fseek(3) in diff3.c's edscript()
check for errors from diff_output() in diff3.c
convert remaining functions in diff3.c to struct got_error
convert error handling in diff3.c's repos() to struct got_error
convert handling in diff3.c's merge() function to struct got_error
4 years ago Hiltjo Posthuma
getline: fix the return type to ssize_t and small nits
remove pointless oflag from struct diff3_state
getline() is, per the latter's OpenBSD man page, safer and more portable than fgetln().
