diff tests/test-subrepo-recursion.t @ 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 9e3910db4e78
children df463ca0adef
line wrap: on
line diff