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

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