blob: 4b559869ab9fb118ac7c2fb6a9181f37e7b479ac [file] [log] [blame]
# Resolve the same conflict on two different devices.
# The format is: <cmd>|<objid>|<version>|<parent1>|<parent2>|<logrec>|<txid>|<txcount>|<deleted>
linkr|c\xfefoo1|3|4||logrec-01