5 years ago 25d0340b7e Stefan Sperling
get rid of an unused global in diff3 code
5 years ago 5176f942be Stefan Sperling
get rid of another global in diff3 code (diff output buffer)
5 years ago 9f98de9c49 Stefan Sperling
declare got_merge_diff3()
5 years ago 5a3ad9e051 Stefan Sperling
wrap overlong long line and fix NULL-deref in merge_diff3()
5 years ago 62f591725a Stefan Sperling
make diff3_merge() write result to an output file
5 years ago 0ec6f01486 Stefan Sperling
expand stupid argv-style parameters of merge_diff3()
5 years ago b90524b163 Stefan Sperling
check for errors from increase() in diff3 code
5 years ago dfc4f8fee4 Stefan Sperling
move more globals into diff state struct
5 years ago 0d26ce361e Stefan Sperling
fix known file descriptor leaks in diff3 code
5 years ago 078e971d4f Stefan Sperling
this is library code; store diff3 state in a struct, not globals
5 years ago c03c6cb3ff Stefan Sperling
make diff3 code compile
5 years ago 537a23663d Stefan Sperling
remove rcsutil code we won't need, and make the rest compile
5 years ago acb209ee71 Stefan Sperling
restore support for D_NORMAL diffs of regular files
5 years ago af45e62627 Stefan Sperling
get rid of xmalloc and err functions in buf.c
5 years ago f54c4c24c9 Stefan Sperling
get rid of xmalloc and a global declaration in worklist code