diff mercurial/simplemerge.py @ 21107:4a6c8b6b10d3

revlog: backout 514d32de6646 - commonancestors
author Mads Kiilerich <madski@unity3d.com>
date Thu, 17 Apr 2014 20:01:39 +0200
parents e34106fa0dc3
children 4aeb7a6029ba
line wrap: on
line diff