comparison tests/test-stabilize-conflict.t @ 1453:8ca31deb8db7

merge with stable (restore test for Mercurial default branch
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 25 Jun 2015 17:38:40 -0700
parents 362e2c8c5677
children c4f8a2916e43
comparison
equal deleted inserted replaced
1449:9be1cadf7a07 1453:8ca31deb8db7