foozy@708: #!/bin/bash foozy@708: foozy@708: hg init scam foozy@708: cd scam foozy@708: foozy@708: #$ name: wife foozy@708: foozy@708: cat > letter.txt < letter.txt < letter.txt <]{7} /tmp/.* foozy@708: foozy@708: export HGMERGE=merge foozy@708: hg merge foozy@708: cat letter.txt foozy@708: foozy@708: #$ name: commit foozy@708: foozy@708: cat > letter.txt <