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

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