lib/diff3.c


Log

Author Commit Date CI Message
Stefan Sperling 0ec6f014 2019-02-08T11:58:03 expand stupid argv-style parameters of merge_diff3()
Stefan Sperling b90524b1 2019-02-08T11:55:19 check for errors from increase() in diff3 code
Stefan Sperling 0d26ce36 2019-02-08T11:48:50 fix known file descriptor leaks in diff3 code
Stefan Sperling 078e971d 2019-02-08T11:44:53 this is library code; store diff3 state in a struct, not globals
Stefan Sperling dfc4f8fe 2019-02-08T11:51:52 move more globals into diff state struct
Stefan Sperling c03c6cb3 2019-02-08T11:13:38 make diff3 code compile
Stefan Sperling 74b37681 2019-02-07T11:30:27 add unmodified buf.c, buf.h, and diff3.c from OpenRCS