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

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