Mercurial > hg
view tests/test-issue672 @ 9761:647f8c857810
i18n-pt_BR: translate 'changeset' like 'revision'
On Mercurial, 'changeset' and 'revision' may be used
interchangeably, but the first is more or less
untranslatable to a single word.
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Tue, 20 Oct 2009 15:26:22 -0200 |
parents | 6c82beaaa11a |
children |
line wrap: on
line source
#!/bin/sh # 0-2-4 # \ \ \ # 1-3-5 # # rename in #1, content change in #4. hg init t cd t touch 1 touch 2 hg commit -Am init # 0 hg rename 1 1a hg commit -m rename # 1 hg co -C 0 echo unrelated >> 2 hg ci -m unrelated1 # 2 hg merge --debug 1 hg ci -m merge1 # 3 hg co -C 2 echo hello >> 1 hg ci -m unrelated2 # 4 hg co -C 3 hg merge -y --debug 4 hg co -C 4 hg merge -y --debug 3