Mercurial > hg
diff tests/killdaemons.py @ 26352:e635bc9bb7d9
resolve: consistently describe re-merge + unresolved
author | timeless@mozdev.org |
---|---|
date | Fri, 25 Sep 2015 03:51:46 -0400 |
parents | 123c99034cb6 |
children | 05cb9c6f310e |
author | timeless@mozdev.org |
---|---|
date | Fri, 25 Sep 2015 03:51:46 -0400 |
parents | 123c99034cb6 |
children | 05cb9c6f310e |