Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2014-02-06 21:08:56 -04:00
commit 679f343905

View file

@ -7,4 +7,4 @@ Digging into that today, I eventually (after rather a long time stuck)
determined the bug involved automatic conflict resolution, but only
happened on systems without symlink support. This let me reproduce it on
FAT outside Windows and do some fast TDD iterations in a much less
unweildly environment and fix the bug.
unwieldly environment and fix the bug.