5 years ago Stefan Sperling

expand stupid argv-style parameters of merge_diff3()

5 years ago Stefan Sperling

check for errors from increase() in diff3 code

5 years ago Stefan Sperling

move more globals into diff state struct

5 years ago Stefan Sperling

fix known file descriptor leaks in diff3 code

5 years ago Stefan Sperling

this is library code; store diff3 state in a struct, not globals

5 years ago Stefan Sperling

make diff3 code compile

5 years ago Stefan Sperling

add unmodified buf.c, buf.h, and diff3.c from OpenRCS