diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-04 15:31:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-04 17:24:12 -0400 |
| commit | f5ce1a15d7a35b85ffa938ee950f4749bf445939 (patch) | |
| tree | 5b0b192fc789fa4b6004a4e43144853af7dde812 /doc/sidebar.mdwn | |
| parent | c69cd93af187c55793052db169abe0d3fb33ef60 (diff) | |
add test case & fix conflict resolution bug on Windows & FAT
Fix bug in automatic merge conflict resolution code when used
on a filesystem not supporting symlinks, which resulted in it losing
track of the symlink bit of annexed files.
This was the underlying bug that was causing another test to fail,
which got worked around in f5d0c8f0bf7f018479eb4da7e8c41598b7aacb7d.
I've chosen to keep 2 separate test cases since the old test case only
detected the problem accidentially.
Test suite passes on FAT & in windows, as well as on proper unix systems.
This commit was sponsored by Ellis Whitehead.
Diffstat (limited to 'doc/sidebar.mdwn')
0 files changed, 0 insertions, 0 deletions