diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-16 18:14:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-16 18:14:25 -0400 |
| commit | 05d9f75922284b6e26208fae4a774fae878dbe03 (patch) | |
| tree | 16ef3263198c2297f607c0dbe8e8cdf8812f32b2 | |
| parent | 5714926ddffe9e3d574b01784552dfbb5355f4d2 (diff) | |
| parent | 2cd4b3eacb8d67f491502d10793ed32bd7f4ea43 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass/comment_7_18e5334ab89efcf89ba8847436d55065._comment | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass/comment_7_18e5334ab89efcf89ba8847436d55065._comment b/doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass/comment_7_18e5334ab89efcf89ba8847436d55065._comment new file mode 100644 index 000000000..197fca67a --- /dev/null +++ b/doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass/comment_7_18e5334ab89efcf89ba8847436d55065._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4" + nickname="Matthew" + subject="comment 7" + date="2014-07-16T21:23:00Z" + content=""" +git-annex version: 5.20140613 also behaves the same way, however it generates a new log message during the sync attempt: + +Automatic merge went well; stopped before committing as requested + + + +"""]] |