4 years ago 937e0e5871 Stefan Sperling

fix build on sparc64 (uninitialized variable) (tags/0.18)

4 years ago f69721c3fc Stefan Sperling

show base commit hash and omit filenames in conflict markers

4 years ago d136cfcb98 Stefan Sperling

show original file content in conflict markers

4 years ago d59c0cb27b Stefan Sperling

improve use of mixed size_t/off_t types in diff3.c's edscript()

4 years ago b2338effff Stefan Sperling

diff3.c: do not use the same variables for both line numbers and byte offsets

4 years ago 887758148e Stefan Sperling

diff3.c's skip() returns number of bytes skipped so switch from int to size_t

4 years ago 96cbb59708 Stefan Sperling

remove worklist code; it was only used to unlink files which we already unlink

4 years ago 68bda3b1b9 Stefan Sperling

diff3.c: check for unlink errors and unlink dp13 and dp23 again

4 years ago 9688d20ad6 Stefan Sperling

rename local variable in diff3.c's edscript() from j to len (not a loop index)

4 years ago 9d4a5e899d Stefan Sperling

rename local variable in diff3.c's skip() from j to len (not a loop index)

4 years ago db33008019 Stefan Sperling

remove pointless attempt of unlinking temporary file name template paths

4 years ago e45311301f Stefan Sperling

do not leak open file in diff3.c's readin() error paths

4 years ago 971405a7e4 Stefan Sperling

do not abuse d3s->fp[0] as a local variable in diff3.c's readin()

4 years ago 50351dee7e Stefan Sperling

remove unused 'pr' argument from diff3.c's skip() function

4 years ago 575e82180a Stefan Sperling

more mechanical conversions to struct got_error: buf_load() and buf_alloc()

4 years ago e19660d59f Stefan Sperling

some whitespace fixes in diff3.c

4 years ago 346b301a61 Stefan Sperling

check for errors from buf_append() in diff3.c's diff_output()

4 years ago 950435fdd3 Stefan Sperling

remove pointless debug code from diff3.c

4 years ago 18b9ebab6e Stefan Sperling

eflag in diff3.c is hard-coded to 3; remove code for other cases

4 years ago e9dabdfbdb Stefan Sperling

check for errors from fseek(3) in diff3.c's edscript()

4 years ago ce09ab8d7c Stefan Sperling

check for errors from diff_output() in diff3.c

4 years ago 02b87977bd Stefan Sperling

convert remaining functions in diff3.c to struct got_error

4 years ago f571bb8516 Stefan Sperling

convert error handling in diff3.c's repos() to struct got_error

4 years ago 180dce26a8 Stefan Sperling

convert handling in diff3.c's merge() function to struct got_error

4 years ago 500467ff1b Hiltjo Posthuma

getline: fix the return type to ssize_t and small nits