Commit Briefs

a551f2158d Stefan Sperling

diff3: make labels work and fix leaks

diff | patch | tree

5d731149d3 Stefan Sperling

initialize temp_files in got_merge_diff3()

diff | patch | tree

abc6a33f6a Stefan Sperling

make readin() actually write to its output argument

diff | patch | tree

25d0340b7e Stefan Sperling

get rid of an unused global in diff3 code

diff | patch | tree

5176f942be Stefan Sperling

get rid of another global in diff3 code (diff output buffer)

diff | patch | tree

9f98de9c49 Stefan Sperling

declare got_merge_diff3()

diff | patch | tree

5a3ad9e051 Stefan Sperling

wrap overlong long line and fix NULL-deref in merge_diff3()

diff | patch | tree

62f591725a Stefan Sperling

make diff3_merge() write result to an output file

diff | patch | tree

0ec6f01486 Stefan Sperling

expand stupid argv-style parameters of merge_diff3()

diff | patch | tree

b90524b163 Stefan Sperling

check for errors from increase() in diff3 code

diff | patch | tree

dfc4f8fee4 Stefan Sperling

move more globals into diff state struct

diff | patch | tree

0d26ce361e Stefan Sperling

fix known file descriptor leaks in diff3 code

diff | patch | tree

078e971d4f Stefan Sperling

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

diff | patch | tree

c03c6cb3ff Stefan Sperling

make diff3 code compile

diff | patch | tree

537a23663d Stefan Sperling

remove rcsutil code we won't need, and make the rest compile

diff | patch | tree

acb209ee71 Stefan Sperling

restore support for D_NORMAL diffs of regular files

diff | patch | tree

af45e62627 Stefan Sperling

get rid of xmalloc and err functions in buf.c

diff | patch | tree

f54c4c24c9 Stefan Sperling

get rid of xmalloc and a global declaration in worklist code

diff | patch | tree

d947271fda Stefan Sperling

add unmodified rcsutil files from OpenRCS

diff | patch | tree

89fd757a44 Stefan Sperling

add unmodified worklist.c and worlist.h from OpenRCS

diff | patch | tree

74b37681cb Stefan Sperling

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

diff | patch | tree

c844a23886 Stefan Sperling

man page tweaks

diff | patch | tree

fdb730fe0d Stefan Sperling

remove an '#if 0' which was not intended for commit

diff | patch | tree

d9498b2018 Stefan Sperling

don't bother showing the HEAD ref in 'got log'

diff | patch | tree

d1688ce089 Stefan Sperling

remove a pointless error code

diff | patch | tree