Commits

Commit:
57ee5d5084c5c07c321352b7412a51d2f89ef298
From:
Stefan Sperling <stsp@stsp.name>
Date:
allow callers of diff3 code to detect merge conflicts
diff | patch | tree
Commit:
a551f2158d980464de9ecc41bab55ff7143103d7
From:
Stefan Sperling <stsp@stsp.name>
Date:
diff3: make labels work and fix leaks
diff | patch | tree
Commit:
5d731149d3ea6345b1d5f305211e91eee9f038cd
From:
Stefan Sperling <stsp@stsp.name>
Date:
initialize temp_files in got_merge_diff3()
diff | patch | tree
Commit:
abc6a33f6abdb9b7560fe12f4d32a2f7471ed81c
From:
Stefan Sperling <stsp@stsp.name>
Date:
make readin() actually write to its output argument
diff | patch | tree
Commit:
25d0340b7ef4cde52e87819c9bf54d65fe136a58
From:
Stefan Sperling <stsp@stsp.name>
Date:
get rid of an unused global in diff3 code
diff | patch | tree
Commit:
5176f942be3e3d8d458985cc7acfb6d320013692
From:
Stefan Sperling <stsp@stsp.name>
Date:
get rid of another global in diff3 code (diff output buffer)
diff | patch | tree
Commit:
9f98de9c4993b8b5ae95cedf9b1d916f6618a887
From:
Stefan Sperling <stsp@stsp.name>
Date:
declare got_merge_diff3()
diff | patch | tree
Commit:
5a3ad9e051c99696dd2552a566a4fcea06a2f227
From:
Stefan Sperling <stsp@stsp.name>
Date:
wrap overlong long line and fix NULL-deref in merge_diff3()
diff | patch | tree
Commit:
62f591725a7d7477ca00fed09795d566f0af4095
From:
Stefan Sperling <stsp@stsp.name>
Date:
make diff3_merge() write result to an output file
diff | patch | tree
Commit:
0ec6f014868a19fd2289c5adeb63767dec547c15
From:
Stefan Sperling <stsp@stsp.name>
Date:
expand stupid argv-style parameters of merge_diff3()
diff | patch | tree
Commit:
b90524b1638d5e4a1b36966fcb5a602d18f5862e
From:
Stefan Sperling <stsp@stsp.name>
Date:
check for errors from increase() in diff3 code
diff | patch | tree
Commit:
dfc4f8fee47b5e8908c4dfc9c5ed1c34c16102fc
From:
Stefan Sperling <stsp@stsp.name>
Date:
move more globals into diff state struct
diff | patch | tree
Commit:
0d26ce361e0d50e331fac03e817a72a4d1edcfe7
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix known file descriptor leaks in diff3 code
diff | patch | tree
Commit:
078e971d4f71f224136916ca245ed368072f3c05
From:
Stefan Sperling <stsp@stsp.name>
Date:
this is library code; store diff3 state in a struct, not globals
diff | patch | tree
Commit:
c03c6cb3ff916176aa6bec7e11bd85761b622f2b
From:
Stefan Sperling <stsp@stsp.name>
Date:
make diff3 code compile
diff | patch | tree
Commit:
537a23663d91fd61df5555e1a2b6dea85a8a80e4
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove rcsutil code we won't need, and make the rest compile
diff | patch | tree
Commit:
acb209ee710a07170e5cf7fe8103dbab0666549b
From:
Stefan Sperling <stsp@stsp.name>
Date:
restore support for D_NORMAL diffs of regular files
diff | patch | tree
Commit:
af45e626271e0fd075c36e588c0da02868393b4c
From:
Stefan Sperling <stsp@stsp.name>
Date:
get rid of xmalloc and err functions in buf.c
diff | patch | tree
Commit:
f54c4c24c918de10964c89c400b6552516bb0069
From:
Stefan Sperling <stsp@stsp.name>
Date:
get rid of xmalloc and a global declaration in worklist code
diff | patch | tree
Commit:
d947271fda9c2c8d82ecb1fd8693fb0f4f6cb1da
From:
Stefan Sperling <stsp@stsp.name>
Date:
add unmodified rcsutil files from OpenRCS
diff | patch | tree
Commit:
89fd757a44dfe29b328b4b5a65fa887811a3b61b
From:
Stefan Sperling <stsp@stsp.name>
Date:
add unmodified worklist.c and worlist.h from OpenRCS
diff | patch | tree
Commit:
74b37681cba183e4655a6b08701e64aeac7c9a05
From:
Stefan Sperling <stsp@stsp.name>
Date:
add unmodified buf.c, buf.h, and diff3.c from OpenRCS
diff | patch | tree
Commit:
c844a238861c088f2a6c8d5a6a2821f082cd77f7
From:
Stefan Sperling <stsp@stsp.name>
Date:
man page tweaks
diff | patch | tree
Commit:
fdb730fe0daaa68f7fb46f49dd64ed01529effc6
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove an '#if 0' which was not intended for commit
diff | patch | tree
Commit:
d9498b2018a8dfb3527a982ca140d9beb2e52dca
From:
Stefan Sperling <stsp@stsp.name>
Date:
don't bother showing the HEAD ref in 'got log'
diff | patch | tree