Mercurial > hgbook
view en/examples/tour-merge-conflict.son.out @ 618:a529952fce96
changed "un tag" to "una etiqueta". Same thing for
"unos tags"
"un tag"
"el tag"
"los tags"
"de tag"
"de tags"
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Sun, 18 Jan 2009 22:21:43 -0500 |
parents | e281bd9a8e47 |
children |
line wrap: on
line source
$ \textbf{cd ..} $ \textbf{hg clone scam scam-son} updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ \textbf{cd scam-son} $ \textbf{cat > letter.txt <<EOF} > \textbf{Greetings!} > \textbf{I am Alhaji Abba Abacha, son of the former} > \textbf{Nigerian dictator Sani Abacha.} > \textbf{EOF} $ \textbf{hg commit -m '419 scam, with son'}