Mercurial > hg
annotate tests/test-parseindex2.py.out @ 26519:48476c6129a2
filemerge: run symlink check for :merge3
Just like :merge, :merge3 doesn't support merging symlinks.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 07 Oct 2015 00:27:23 -0700 |
parents | 75fdc39b6172 |
children |
rev | line source |
---|---|
7110
75fdc39b6172
Add parseindex2.py test case
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
1 done |