Skip to content
Snippets Groups Projects
Commit 28f01c31 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

largefiles: don't use 'r' action for standin that doesn't exist

When merging and the remote has turned a normal file into a largefile
and the user chooses to keep the local largefile, we use the 'r'
action for the remote largefile standin. This is wrong, since that
file does not exist in the parent of the working copy. Use 'k', which
does nothing but debug logging, instead.
parent da733837
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment