|
57ee5d50
|
2019-02-08T15:10:49
|
|
allow callers of diff3 code to detect merge conflicts
|
|
a551f215
|
2019-02-08T14:58:30
|
|
diff3: make labels work and fix leaks
|
|
5d731149
|
2019-02-08T13:22:01
|
|
initialize temp_files in got_merge_diff3()
|
|
abc6a33f
|
2019-02-08T13:20:08
|
|
make readin() actually write to its output argument
|
|
25d0340b
|
2019-02-08T12:27:42
|
|
get rid of an unused global in diff3 code
|
|
5176f942
|
2019-02-08T12:26:49
|
|
get rid of another global in diff3 code (diff output buffer)
|
|
078e971d
|
2019-02-08T11:44:53
|
|
this is library code; store diff3 state in a struct, not globals
|
|
c03c6cb3
|
2019-02-08T11:13:38
|
|
make diff3 code compile
|
|
9f98de9c
|
2019-02-08T12:09:28
|
|
declare got_merge_diff3()
|
|
5a3ad9e0
|
2019-02-08T12:06:59
|
|
wrap overlong long line and fix NULL-deref in merge_diff3()
|
|
62f59172
|
2019-02-08T12:01:51
|
|
make diff3_merge() write result to an output file
|
|
0ec6f014
|
2019-02-08T11:58:03
|
|
expand stupid argv-style parameters of merge_diff3()
|
|
b90524b1
|
2019-02-08T11:55:19
|
|
check for errors from increase() in diff3 code
|
|
dfc4f8fe
|
2019-02-08T11:51:52
|
|
move more globals into diff state struct
|
|
0d26ce36
|
2019-02-08T11:48:50
|
|
fix known file descriptor leaks in diff3 code
|
|
74b37681
|
2019-02-07T11:30:27
|
|
add unmodified buf.c, buf.h, and diff3.c from OpenRCS
|