]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commit
projects / tahoe-lafs / tahoe-lafs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7a2e021) | patch
Basic remote conflict detection based on ancestor uri
authorDaira Hopwood <daira@jacaranda.org>
Tue, 27 Oct 2015 18:44:45 +0000 (18:44 +0000)
committerDaira Hopwood <daira@jacaranda.org>
Tue, 27 Oct 2015 18:44:45 +0000 (18:44 +0000)
commit63ad778b7d671ea0a6a7aac94bd0c0300bcac5b0
tree95d1af008e38da14c8786b2df48ae93b6e95e261tree | snapshot
parent7a2e021c7566137a29e06dc37a516b1177b20374commit | diff
Basic remote conflict detection based on ancestor uri

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/frontends/magic_folder.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.