Commits

Commit:
18b9ebab6e93f7d3714f10adf4b4f48eec65abd2
From:
Stefan Sperling <stsp@stsp.name>
Date:
eflag in diff3.c is hard-coded to 3; remove code for other cases
diff | patch | tree
Commit:
e9dabdfbdb742547fc6c853c2626364177aa2b71
From:
Stefan Sperling <stsp@stsp.name>
Date:
check for errors from fseek(3) in diff3.c's edscript()
diff | patch | tree
Commit:
ce09ab8d7c6ac174b679aa0fe508d5874850b0e0
From:
Stefan Sperling <stsp@stsp.name>
Date:
check for errors from diff_output() in diff3.c
diff | patch | tree
Commit:
02b87977bd0146a384fdd4f4a51fd4b0026fdeef
From:
Stefan Sperling <stsp@stsp.name>
Date:
convert remaining functions in diff3.c to struct got_error
diff | patch | tree
Commit:
f571bb85169c90466112df17c15064e65961f877
From:
Stefan Sperling <stsp@stsp.name>
Date:
convert error handling in diff3.c's repos() to struct got_error
diff | patch | tree
Commit:
180dce26a8f1dbb0aad3e817cde76bf0e8e55517
From:
Stefan Sperling <stsp@stsp.name>
Date:
convert handling in diff3.c's merge() function to struct got_error
diff | patch | tree
Commit:
500467ff1bf0dbd15c0941dd741e80c35c708818
From:
Hiltjo Posthuma <hiltjo@codemadness.org>
Date:
getline: fix the return type to ssize_t and small nits
diff | patch | tree
Commit:
b077bccd438edd49ae00d5a8c7ab4beffae5a53e
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove pointless oflag from struct diff3_state
diff | patch | tree
Commit:
6dea73dfe78ac9b1bfcc7b80edecc00974c50c38
From:
Steven McDonald <steven@steven-mcdonald.id.au>
Via:
Stefan Sperling <stsp@stsp.name>
Date:
Replace fgetln() with getline() getline() is, per the latter's OpenBSD man page, safer and more portable than fgetln().
diff | patch | tree
Commit:
acb4e1d19e58daa7f81698af44c07fe3173da4fa
From:
Stefan Sperling <stsp@stsp.name>
Date:
sync merge(1) fix diff from OpenRCS/OpenCVS
diff | patch | tree
Commit:
d473b4e492e89856bc4fea9aaea739bddd5c5e4b
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix merge bug inherited from OpenRCS, affecting lines with leading .
diff | patch | tree
Commit:
638f9024045bbe2420143f8868dcc484c231c634
From:
Stefan Sperling <stsp@stsp.name>
Date:
rename got_error_prefix_errno() to got_error_from_errno()
diff | patch | tree
Commit:
230a42bdc60c6136d2a5ce65bf1a2f26d990c096
From:
joshua stein <jcs@jcs.org>
Date:
got_error_from_errno -> got_error_prefix_errno also add got_error_prefix_errno2 and got_error_prefix_errno3 which should hopefully all be merged into a single function with variadic args (but can't alloc mem)
diff | patch | tree
Commit:
01a44956166c76e44f58809e5a1ea1477adfef80
From:
Stefan Sperling <stsp@stsp.name>
Date:
declare conflict marker strings in got_lib_diff.h
diff | patch | tree
Commit:
fb43ecf1500cf7f8b2e22348bd1635edcda97fee
From:
Stefan Sperling <stsp@stsp.name>
Date:
check for errors from fclose()
diff | patch | tree
Commit:
cbe7f84890b5be0eb0e47f67f1606f66db181eae
From:
Stefan Sperling <stsp@stsp.name>
Date:
check for fflush() errors
diff | patch | tree
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