comparison tests/test-merge5.t @ 29038:a9dd92c48a1c stable

tags: silence cache parsing errors Follow our standard STFU cache-handling pattern
author Matt Mackall <mpm@selenic.com>
date Thu, 28 Apr 2016 15:35:54 -0500
parents 6b1fc09c699a
children 527ce85c2e60
comparison
equal deleted inserted replaced
29037:b043d7f27a0e 29038:a9dd92c48a1c