Commit Briefs

Stefan Sperling

sync merge(1) fix diff from OpenRCS/OpenCVS

diff | patch | tree

Stefan Sperling

fix merge bug inherited from OpenRCS, affecting lines with leading .

diff | patch | tree

Stefan Sperling

rename got_error_prefix_errno() to got_error_from_errno()

diff | patch | tree

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

Stefan Sperling

declare conflict marker strings in got_lib_diff.h

diff | patch | tree

Stefan Sperling

check for errors from fclose()

diff | patch | tree

Stefan Sperling

check for fflush() errors

diff | patch | tree

Stefan Sperling

allow callers of diff3 code to detect merge conflicts

diff | patch | tree

Stefan Sperling

diff3: make labels work and fix leaks

diff | patch | tree

Stefan Sperling

initialize temp_files in got_merge_diff3()

diff | patch | tree

Stefan Sperling

make readin() actually write to its output argument

diff | patch | tree

Stefan Sperling

get rid of an unused global in diff3 code

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

declare got_merge_diff3()

diff | patch | tree

Stefan Sperling

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

diff | patch | tree