Sign in
vanadium
/
roadmap.go.syncbase
/
19133a0d733b5327a30b97a7d19850e401ccbdfd
/
.
/
x
/
ref
/
services
/
syncbase
/
vsync
/
testdata
/
remote-noconf-link-repeat.log.sync
blob: 31e85a939500c4bf16657ba48785b625c2a19169 [
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
