Mercurial > hg
diff tests/test-merge2.t @ 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 | f2719b387380 |
children | 1850066f9e36 |