diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-04 01:58:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-04 02:03:15 -0400 |
| commit | cfe87407f493e428ca8e1d5592b228675199afb3 (patch) | |
| tree | 260e68fab396ba20c515a31a7ad8a88e2bcf3aeb /doc/bugs/Incorrect_version_on_64_Standalone_Build.mdwn | |
| parent | 0ba6b3aa7d3a7528ba95ffbae7df6634adbed9b6 (diff) | |
finish fixing direct mode merge bug involving unstaged local files
Added test cases for both ways this can happen, with a conflict involving a
file, or a directory.
Cleaned up resolveMerge to not touch the work tree in direct mode, which
turned out to be the only way to handle things.. And makes it much nicer.
Still need to run test suite on windows.
Diffstat (limited to 'doc/bugs/Incorrect_version_on_64_Standalone_Build.mdwn')
0 files changed, 0 insertions, 0 deletions