diff tests/test-no-symlinks.t @ 26352:e635bc9bb7d9

resolve: consistently describe re-merge + unresolved
author timeless@mozdev.org
date Fri, 25 Sep 2015 03:51:46 -0400
parents 7a9cbb315d84
children 2d49d2eb1ff2
line wrap: on
line diff