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

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