comparison tests/test-obsconvert.t @ 2857:0c286d054bcd

warning: use 'divergent', not 'contentdivergent' on old Mercurial This was just an oversight in f6517779a7c4 (warning: rename warning message, 2017-08-24).
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 24 Aug 2017 10:48:38 -0700
parents cbc7a69116bd
children 06844693bb21
comparison
equal deleted inserted replaced
2856:f6517779a7c4 2857:0c286d054bcd