diff Makefile @ 26361:6b4a0c602bec

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