Mercurial > hg-stable
view tests/test-1102.t @ 24179:14d647d25c70
merge-tools: configuration for Beyond Compare on OS X
Based on the Linux configuration entry.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 27 Feb 2015 21:42:58 +0100 |
parents | f2719b387380 |
children |
line wrap: on
line source
$ rm -rf a $ hg init a $ cd a $ echo a > a $ hg ci -Am0 adding a $ hg tag t1 # 1 $ hg tag --remove t1 # 2 $ hg co 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg tag -f -r0 t1 $ hg tags tip 3:a49829c4fc11 t1 0:f7b1eb17ad24 $ cd ..