Mercurial > hg
diff tests/test-gendoc.t @ 26352:e635bc9bb7d9
resolve: consistently describe re-merge + unresolved
author | timeless@mozdev.org |
---|---|
date | Fri, 25 Sep 2015 03:51:46 -0400 |
parents | 1fdb1d909c79 |
children | 4a080cf31565 |
author | timeless@mozdev.org |
---|---|
date | Fri, 25 Sep 2015 03:51:46 -0400 |
parents | 1fdb1d909c79 |
children | 4a080cf31565 |