Mercurial > hgbook
view en/examples/tour-merge-conflict @ 401:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed, 20 Aug 2008 22:00:46 +0200 |
parents | ceaca14e49f0 |
children | bc14f94e726a |
line wrap: on
line source
#!/bin/bash hg init scam cd scam #$ name: wife cat > letter.txt <<EOF Greetings! I am Mariam Abacha, the wife of former Nigerian dictator Sani Abacha. EOF hg add letter.txt hg commit -m '419 scam, first draft' #$ name: cousin cd .. hg clone scam scam-cousin cd scam-cousin cat > letter.txt <<EOF Greetings! I am Shehu Musa Abacha, cousin to the former Nigerian dictator Sani Abacha. EOF hg commit -m '419 scam, with cousin' #$ name: son cd .. hg clone scam scam-son cd scam-son cat > letter.txt <<EOF Greetings! I am Alhaji Abba Abacha, son of the former Nigerian dictator Sani Abacha. EOF hg commit -m '419 scam, with son' #$ name: pull cd .. hg clone scam-cousin scam-merge cd scam-merge hg pull -u ../scam-son #$ name: merge #$ ignore: [<>]{7} /tmp/.* export HGMERGE=merge hg merge cat letter.txt #$ name: commit cat > letter.txt <<EOF Greetings! I am Bryan O'Sullivan, no relation of the former Nigerian dictator Sani Abacha. EOF hg resolve -m letter.txt hg commit -m 'Send me your money' hg tip