one little bug..

This commit is contained in:
Joey Hess 2016-04-06 19:23:32 -04:00
parent 6549049142
commit 64de6dcc74
Failed to extract signature

View file

@ -286,3 +286,5 @@ into adjusted view worktrees.]
have already been handled by updateAdjustedBranch. But, if another remote
pushed a new master at just the right time, the adjusted branch could be
rebased on top of a master that it doesn't incorporate, which is wrong.
* Annex symlinks generated in merging into an adjusted branch are badly
formed to point to the temp git dir's annex object dir.