This commit is contained in:
http://joeyh.name/ 2014-06-13 14:53:23 +00:00 committed by admin
parent 6f57e57cf0
commit e9d411d0a6

View file

@ -0,0 +1,7 @@
Two clients, both in direct mode, both running assistant.
When a change is made on A, the assistant commits it to annex/direct/master. But, the master branch is not changed.
B notices there is a change, pulls from A. Gets annex/direct/master, but does not merge it into its local branch at all.
[[!tag confirmed]]