comparison tests/test-stabilize-conflict.t @ 1082:74bc8a0c2c02

pull: drop the custom bundle2 part
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 27 Aug 2014 17:31:21 +0200
parents 0fcddde7dae6
children bac4e0bc9f6a
comparison
equal deleted inserted replaced
1081:dddb8a70437c 1082:74bc8a0c2c02