Mercurial > hg > config
diff python/hg-merge.py @ 832:b9be1237fffa
revert to python2 for time being
author | Jeff Hammel <k0scist@gmail.com> |
---|---|
date | Sun, 19 Feb 2017 20:27:07 -0800 |
parents | 7bad4b7281f2 |
children |
author | Jeff Hammel <k0scist@gmail.com> |
---|---|
date | Sun, 19 Feb 2017 20:27:07 -0800 |
parents | 7bad4b7281f2 |
children |