diff mercurial/localrepo.py @ 21081:ffd7b6ce46ff

merge: pass merge ancestor to calculateupdates as a list The list will so far always have one element.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 06 Apr 2014 13:39:51 +0200
parents 19b9f23a8c6f
children 53433d8f1faa
line wrap: on
line diff