You have not concluded your merge (MERGE_HEAD exists).
By rupert.thur... on July 02, 2013 18:59 (imported from Google Code)
What steps will reproduce the problem?
- abort merge after conflict (not sure which button one needs to press though to leave it like this)
What is the expected output? What do you see instead?
expected is that the log view somehow shows this state and allows to abort it.
What version of TortoiseGit and msysgit are you using? On
what operating system?
1.8.3, 1.8.3-preview20130601, on windows7
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information