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