diff tests/test-histedit-bookmark-motion.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 5840da876235
children d2a5986cb89d
line wrap: on
line diff