comparison tests/test-extension.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 dcd3c47e464b
children 51e5c793a9f4
comparison
equal deleted inserted replaced
21171:33737ebc6f39 21172:0f0059af920c