summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff3/diff3prog.c
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2013-11-15 21:41:54 +0000
committerdlg <dlg@openbsd.org>2013-11-15 21:41:54 +0000
commitd4ca8065ff9e61448f66eeaa06f6b71fac8eee22 (patch)
tree225a7ca3d2b1f527d333ab06c18ce10b5b78e7b5 /usr.bin/diff3/diff3prog.c
parentRevert 1.858, as it causes panics of inp: (diff)
downloadwireguard-openbsd-d4ca8065ff9e61448f66eeaa06f6b71fac8eee22.tar.xz
wireguard-openbsd-d4ca8065ff9e61448f66eeaa06f6b71fac8eee22.zip
calculate the line in the sand before comparing it to ticks, which looks
more like the original conditional. if this doesnt fix rd thrushs panic, then this should be reverted to r1.85.
Diffstat (limited to 'usr.bin/diff3/diff3prog.c')
0 files changed, 0 insertions, 0 deletions