tests/missing-comment.hg
author Mads Kiilerich <madski@unity3d.com>
Sun, 06 Apr 2014 13:39:51 +0200
changeset 21080 04540a8499a3
parent 17064 168cc52ad7c2
permissions -rw-r--r--
merge: move ancestor selection tweaking from manifestmerge to update function - passing it through calculateupdates. This will make sure manifestmerge actually use the ancestor it is given.

(binary:application/octet-stream)