5 years ago 276262e805 Stefan Sperling

fix typo in status code name: GOT_STATUS_MODIFIY -> GOT_STATUS_MODIFY

5 years ago 7f838b36bf Stefan Sperling

document status codes displayed by 'got update'

5 years ago 6353ad76e4 Stefan Sperling

make 'got update' merge file edits

5 years ago 57ee5d5084 Stefan Sperling

allow callers of diff3 code to detect merge conflicts

5 years ago a551f2158d Stefan Sperling

diff3: make labels work and fix leaks

5 years ago 5d731149d3 Stefan Sperling

initialize temp_files in got_merge_diff3()

5 years ago abc6a33f6a Stefan Sperling

make readin() actually write to its output argument

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

5 years ago d947271fda Stefan Sperling

add unmodified rcsutil files from OpenRCS

5 years ago 89fd757a44 Stefan Sperling

add unmodified worklist.c and worlist.h from OpenRCS

5 years ago 74b37681cb Stefan Sperling

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