head	1.2;
access;
symbols;
locks;
comment	@# @;


1.2
date	2004.07.31.00.56.52;	author dunc;	state Exp;
branches;
next	1.1;

1.1
date	2003.12.22.05.52.24;	author dunc;	state Exp;
branches;
next	;


desc
@@


1.2
log
@orig files with rcsmerge conflicts
@
text
@#!/bin/sh
#set -x
[ -n "$1" -a -z "$2" ] || { echo -e "Bad arg(s)\\nUsage:- todo <file>";exit 1; }
case "$1" in
  *.orig) exit 0 ;;
esac
cat $1|grep '>>>>'>/dev/null && orig $1
@


1.1
log
@Initial revision
@
text
@d3 5
a7 6
[ -n "$1" -a -n "$2" ] || { echo -e "Missing arg \\nUsage:- todo <base> <candidate>";exit 1; }
diff $1 $2 >/dev/null &&
{
  rm -v $2
  ln -sv $1 $2
}
@
