diff tests/test-merge-prompt.t @ 22138:80206e63c3cc

test-revert: add case where wc content is already reverted to base content This test highlights multiple misbehaviors of revert. We augment the test comments accordingly.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 27 Jun 2014 18:07:33 +0200
parents c8ba98bf0e71
children 9ab18a912c44
line wrap: on
line diff