diff tests/test-diff-unified.t @ 26361:6b4a0c602bec

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