5 years ago Stefan Sperling
fix typo in status code name: GOT_STATUS_MODIFIY -> GOT_STATUS_MODIFY
document status codes displayed by 'got update'
make 'got update' merge file edits
allow callers of diff3 code to detect merge conflicts
diff3: make labels work and fix leaks
initialize temp_files in got_merge_diff3()
make readin() actually write to its output argument
get rid of an unused global in diff3 code
get rid of another global in diff3 code (diff output buffer)
declare got_merge_diff3()
wrap overlong long line and fix NULL-deref in merge_diff3()
make diff3_merge() write result to an output file
expand stupid argv-style parameters of merge_diff3()
check for errors from increase() in diff3 code
move more globals into diff state struct
fix known file descriptor leaks in diff3 code
this is library code; store diff3 state in a struct, not globals
make diff3 code compile
remove rcsutil code we won't need, and make the rest compile
restore support for D_NORMAL diffs of regular files
get rid of xmalloc and err functions in buf.c
get rid of xmalloc and a global declaration in worklist code
add unmodified rcsutil files from OpenRCS
add unmodified worklist.c and worlist.h from OpenRCS
add unmodified buf.c, buf.h, and diff3.c from OpenRCS