parsing for conflicts:
authorroot <devnull@localhost>
Thu, 27 Jun 1996 20:15:53 +0000 (20:15 +0000)
committerroot <devnull@localhost>
Thu, 27 Jun 1996 20:15:53 +0000 (20:15 +0000)
commit93a5a6fd147882d797c61ef7f014fe966db8bffa
tree16b828d3c1905e2b980395da8715297c94809d15
parentb2ffaeb0dd3bdddc8e73d30e2bfffa12bcc4ed93
parsing for conflicts:

CVS patchset: 692
CVS date: 1996/06/27 20:15:53
build/spec.c