]> 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: 311ff42) | 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>
Mon, 28 Dec 2015 16:18:53 +0000 (16:18 +0000)
commit6c17e20970878c8dad619688e87f43d3965dcf28
tree7687193f28ba3eb732ba8502ae9212fd8688513ftree | snapshot
parent311ff42113f38f4e8d608108d76f5b26283a7a51commit | 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.