Mercurial > hg
diff mercurial/simplemerge.py @ 27408:2916ebaef312
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 17 Dec 2015 17:27:32 -0600 |
parents | ef1eb6df7071 |
children | a504794cee29 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 17 Dec 2015 17:27:32 -0600 |
parents | ef1eb6df7071 |
children | a504794cee29 |