Skip to content
Snippets Groups Projects
Commit df9b73d2d444 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

largefiles: fall back to the original for change/delete conflicts

The largefiles merge code (currently) does not handle change/delete conflicts.
So fall back to regular filemerge in that case.

Making this code handle change/delete conflicts is left as an exercise for the
future.
parent 0d61f7ec7f76
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