Sign in
vanadium
/
release.go.x.ref
/
5151289ef29c99223ab0c514de10c165c47d7c1c
/
.
/
services
/
syncbase
/
vsync
/
testdata
/
remote-noconf-link-repeat.log.sync
blob: 838803375f8230655b28436ab326cf92b67b058c [
file
] [
log
] [
blame
]
# Resolve the same conflict on two different devices.
# The format is: <cmd>|<objid>|<version>|<parent1>|<parent2>|<logrec>|<txid>|<txcount>|<deleted>
linkr
|
foo1
|
3
|
4
||
$sync
:
log
:
12
:
1
