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

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