summaryrefslogtreecommitdiff
path: root/usr.bin/diff3
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2013-06-02 21:08:20 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2013-06-02 21:08:20 +0000
commit6aa0871199c60f997a2537be5a932b64e2503330 (patch)
tree5e0f3f41500cf74a854ab28458a3db913a45d171 /usr.bin/diff3
parent5aa2efae5c176bf4e4709f926b8fda5d2c6010ec (diff)
fix id, from brad
Diffstat (limited to 'usr.bin/diff3')
0 files changed, 0 insertions, 0 deletions