--- coherent/f/local/bin/merge 2019/05/29 04:56:40 1.1 +++ coherent/f/local/bin/merge 2019/05/29 04:56:40 1.1.1.1 @@ -1,5 +1,5 @@ -# $Id: merge,v 1.1 2019/05/29 04:56:40 root Exp $ +# $Id: merge,v 1.1.1.1 2019/05/29 04:56:40 root Exp $ PATH=/bin:/usr/bin DIFF=/bin/diff