HomeSort by: relevance | last modified time | path
    Searched refs:rcsmerge (Results 1 - 3 of 3) sorted by relevancy

  /src/external/gpl2/rcs/bin/rcsmerge/
Makefile 3 PROG= rcsmerge
  /src/external/gpl2/rcs/bin/
Makefile 2 SUBDIR = ci co ident merge rcs rcsclean rcsdiff rcsfreeze rcsmerge rlog
  /src/external/gpl2/rcs/dist/src/
rcstest 363 rcsmerge -E -r2.2 -r2.3 $q a.c
368 "so merge and rcsmerge ignore overlaps and suppress overlap lines."
370 $diff a.1 a.c || { echo "#rcsmerge failed (status 0)"; exit 1; }
372 "so rcsmerge does not warn about overlap lines that it generates."
376 $diff a.1 a.c || { echo "#rcsmerge failed (status 1)"; exit 1; }
379 echo "#rcsmerge bad status"; exit 1

Completed in 23 milliseconds