--- 43BSD/contrib/rcs/src/merge 2018/04/24 16:12:54 1.1 +++ 43BSD/contrib/rcs/src/merge 2018/04/24 16:12:54 1.1.1.1 @@ -1,6 +1,6 @@ #! /bin/sh # Three-way file merge. -# $Header: /var/lib/cvsd/CSRG/43BSD/contrib/rcs/src/merge,v 1.1 2018/04/24 16:12:54 root Exp $ +# $Header: /var/lib/cvsd/CSRG/43BSD/contrib/rcs/src/merge,v 1.1.1.1 2018/04/24 16:12:54 root Exp $ # use: merge [-p] file1 file2 file3 [mark1 mark3] # Effect: incorporates all changes that lead from file2 to file3 into file1. # Result goes to std. output if -p is present, into file1 otherwise.