diff contrib/check-code.py @ 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 a61ed1c2d7a7
children 131f7fe06e9e
line wrap: on
line diff