diff tests/test-merge-prompt.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 c8ba98bf0e71
children 9ab18a912c44
line wrap: on
line diff