Mercurial > hg-stable
comparison tests/test-mv-cp-st-diff.t @ 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 | c48924787eaa |
children | 4441705b7111 |
comparison
equal
deleted
inserted
replaced
26518:a77679d0b887 | 26519:48476c6129a2 |
---|