view tests/test-status-inprocess.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 07dbafd3a0e2
children
line wrap: on
line source

% creating repo
% add and commit
C test.py
% change
M test.py