Mercurial > hg
diff mercurial/match.py @ 26352:e635bc9bb7d9
resolve: consistently describe re-merge + unresolved
author | timeless@mozdev.org |
---|---|
date | Fri, 25 Sep 2015 03:51:46 -0400 |
parents | a5f62af29517 |
children | 56b2bcea2529 |
author | timeless@mozdev.org |
---|---|
date | Fri, 25 Sep 2015 03:51:46 -0400 |
parents | a5f62af29517 |
children | 56b2bcea2529 |