Mercurial > hg
view tests/test-merge-types @ 5576:1c1ef561d541
doc: add repo/ to .hgignore and .hgtags
These names were disappearing in the asciidoc output and no form of
escaping seems to help. Let's just add repo/ to make it explicit that
they're in the repository root.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 02 Dec 2007 15:52:36 -0600 |
parents | 6f26c7677463 |
children | 048889f8c7d1 |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg ci -Amadd chmod +x a hg ci -mexecutable hg up 0 rm a ln -s symlink a hg ci -msymlink hg merge echo % symlink is left parent, executable is right if [ -L a ]; then echo a is a symlink readlink a elif [ -x a ]; then echo a is executable fi hg update -C 1 hg merge echo % symlink is right parent, executable is left if [ -L a ]; then echo a is a symlink readlink a elif [ -x a ]; then echo a is executable fi