ba42b67c70
When one side is an annexed symlink, and the other side is a non-annexed symlink. In this case, git-merge does not replace the annexed symlink in the work tree with the non-annexed symlink, which is different from it's handling of conflicts between annexed symlinks and regular files or directories. So, while git-annex generated the correct merge commit, the work tree didn't get updated to reflect it. See comments on bug for additional analysis. Did not add this to the test suite yet; just unloaded a truckload of firewood and am feeling lazy. This commit was sponsored by Adam Spiers. |
||
|---|---|---|
| .. | ||
| tests | ||
| changelog | ||
| compat | ||
| control | ||
| copyright | ||
| doc-base | ||
| menu | ||
| NEWS | ||
| rules | ||