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

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