diff tests/test-conflict.t @ 21101:64911a12dc28

ancestors: extract candidates function as commonancestorsheads
author Mads Kiilerich <madski@unity3d.com>
date Thu, 17 Apr 2014 19:49:56 +0200
parents 2371f4aea665
children 25d5a9ecbb85
line wrap: on
line diff