This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w 2011-07-07 11:08:35 +00:00 committed by admin
parent c5296dee1f
commit 8da1dd0336

View file

@ -0,0 +1,3 @@
While merging the git-annex branch, annex-merge does not end up in a fast-forward even when it would be possible.
But as sometimes annex-merge takes time, it would probably be worth it
(but maybe I miss something with my workflow...).