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

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