Commit Briefs

638f902404 Stefan Sperling

rename got_error_prefix_errno() to got_error_from_errno()

diff | patch | tree

230a42bdc6 joshua stein

got_error_from_errno -> got_error_prefix_errno

also add got_error_prefix_errno2 and got_error_prefix_errno3 which should hopefully all be merged into a single function with variadic args (but can't alloc mem)

diff | patch | tree

01a4495616 Stefan Sperling

declare conflict marker strings in got_lib_diff.h

diff | patch | tree

fb43ecf150 Stefan Sperling

check for errors from fclose()

diff | patch | tree

cbe7f84890 Stefan Sperling

check for fflush() errors

diff | patch | tree

57ee5d5084 Stefan Sperling

allow callers of diff3 code to detect merge conflicts

diff | patch | tree

a551f2158d Stefan Sperling

diff3: make labels work and fix leaks

diff | patch | tree

5d731149d3 Stefan Sperling

initialize temp_files in got_merge_diff3()

diff | patch | tree

abc6a33f6a Stefan Sperling

make readin() actually write to its output argument

diff | patch | tree

25d0340b7e Stefan Sperling

get rid of an unused global in diff3 code

diff | patch | tree

5176f942be Stefan Sperling

get rid of another global in diff3 code (diff output buffer)

diff | patch | tree

9f98de9c49 Stefan Sperling

declare got_merge_diff3()

diff | patch | tree

5a3ad9e051 Stefan Sperling

wrap overlong long line and fix NULL-deref in merge_diff3()

diff | patch | tree

62f591725a Stefan Sperling

make diff3_merge() write result to an output file

diff | patch | tree

0ec6f01486 Stefan Sperling

expand stupid argv-style parameters of merge_diff3()

diff | patch | tree