Mercurial > hg
diff tests/test-minirst.py @ 26352:e635bc9bb7d9
resolve: consistently describe re-merge + unresolved
author | timeless@mozdev.org |
---|---|
date | Fri, 25 Sep 2015 03:51:46 -0400 |
parents | af9d9b778550 |
children | 67a4e42a651f |
author | timeless@mozdev.org |
---|---|
date | Fri, 25 Sep 2015 03:51:46 -0400 |
parents | af9d9b778550 |
children | 67a4e42a651f |