]> 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: 41a9ced) | 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)
committermeejah <meejah@meejah.ca>
Wed, 20 Jan 2016 08:30:16 +0000 (01:30 -0700)
commita1989f3fe50c604bf94babb6c6cde829f9808407
treed22ad08b02b05f091b787649f8a851afb0251d40tree | snapshot
parent41a9ced24a5c4ea4cdc3ed4783efdd703395f10bcommit | 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.