view tests/test-status-inprocess.py.out @ 20792:89059c450c56

merge: mark mergestate as dirty when resolve changes _state Correctness - no visible difference so far.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 28 Feb 2014 02:26:03 +0100
parents 07dbafd3a0e2
children
line wrap: on
line source

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