]> 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: b92f612) | 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 15:30:05 +0000 (15:30 +0000)
commit5777103a881c1dc9ecadf2ab1159215228222cec
treeba4cb05879095e561a5e9140407edbca903a385dtree | snapshot
parentb92f6126107a347c0f5c00effdf5f4ecd220c1abcommit | 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.