comparison mercurial/pure/base85.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 20a9d823f242
children 9007f697e8ef
comparison
equal deleted inserted replaced
20791:8dd867bd67e1 20792:89059c450c56