Source

mercurial/crew/tonfa / tkmerge

Full commit
merge $1 $3 $2 || tkdiff -conflict $1 -o $1