diff tests/test-issue1175.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 70e2a22fd66e
children a387b0390082
line wrap: on
line diff