diff tests/test-bdiff.py @ 26361:6b4a0c602bec

merge: fix mergestate comment
author timeless@mozdev.org
date Fri, 25 Sep 2015 00:54:20 -0400
parents eeac5e179243
children 2e54aaa65afc
line wrap: on
line diff