#!/bin/rc fn usage { echo usage: merge [-n days] file.... dir echo ' 'merge [-n days] file1 file2 } fn domerge { echo gnu/diff3 -m $1 `{yesterday $opts $2} $2 gnu/diff3 -m $1 `{yesterday $opts $2} $2 > $2.xxx cp $2.xxx $2 && rm $2.xxx } opts=() while(! ~ $#* 0 && ~ $1 -* && ! ~ $1 --){ opts=($opts $1) shift } if(! ~ $#* 0 && ~ $1 --) shift if(~ $#* 0 1) usage if(test -d $$#*) { d=$$#* while(! ~ $#* 1) { domerge $1 $d/$1 shift } } if not { if (! ~ $#* 2) usage domerge $1 $2 }