Mercurial > hg
diff tests/test-histedit-outgoing.t @ 26352:e635bc9bb7d9
resolve: consistently describe re-merge + unresolved
author | timeless@mozdev.org |
---|---|
date | Fri, 25 Sep 2015 03:51:46 -0400 |
parents | 5706d130ec16 |
children | 11be6b7f95da |
author | timeless@mozdev.org |
---|---|
date | Fri, 25 Sep 2015 03:51:46 -0400 |
parents | 5706d130ec16 |
children | 11be6b7f95da |