diff tests/test-trusted.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 fa91ddfc3f36
children c4040a35b5d9
line wrap: on
line diff