Commits


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


getline: fix the return type to ssize_t and small nits


remove pointless oflag from struct diff3_state