Mercurial > hg
diff mercurial/simplemerge.py @ 26361:6b4a0c602bec
merge: fix mergestate comment
author | timeless@mozdev.org |
---|---|
date | Fri, 25 Sep 2015 00:54:20 -0400 |
parents | ed12abab068e |
children | 56b2bcea2529 |
author | timeless@mozdev.org |
---|---|
date | Fri, 25 Sep 2015 00:54:20 -0400 |
parents | ed12abab068e |
children | 56b2bcea2529 |