diff mercurial/simplemerge.py @ 21168:355058ad8405 stable

merge: fix wrong number of arguments for bid merge message
author Mads Kiilerich <madski@unity3d.com>
date Mon, 21 Apr 2014 19:53:19 +0200
parents e34106fa0dc3
children 4aeb7a6029ba
line wrap: on
line diff