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

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