comparison tests/test-ancestor.py @ 21172:0f0059af920c stable

merge: improve notes for listing the bids for ambiguous merges
author Mads Kiilerich <madski@unity3d.com>
date Mon, 21 Apr 2014 20:24:54 +0200
parents 7731a2281cf0
children 731b2a90983b
comparison
equal deleted inserted replaced
21171:33737ebc6f39 21172:0f0059af920c