Mercurial > hg
comparison tests/test-revlog-ancestry.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 | f88c60e740a1 |
children | b6db2e80a9ce |
comparison
equal
deleted
inserted
replaced
26518:a77679d0b887 | 26519:48476c6129a2 |
---|