27eaa6f410
sync, merge, assistant: When git merge failed for a reason other than a conflicted merge, such as a crippled filesystem not allowing particular characters in filenames, git-annex would make a merge commit that could omit such files or otherwise be bad. Fixed by aborting the whole merge process when git merge fails for any reason other than a merge conflict. |
||
|---|---|---|
| .. | ||
| patches | ||
| tests | ||
| cabal-wrapper | ||
| changelog | ||
| compat | ||
| control | ||
| copyright | ||
| create-standalone-changelog | ||
| doc-base | ||
| git-annex.lintian-overrides | ||
| menu | ||
| NEWS | ||
| rules | ||