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