Merge Tool v2

look 2 posts above....tztz... read the whole thread before posting...

Why can I use this merge, I opened the customer service terminal and crashed directly

Is there a way to prevent software to merge .git directory ? I know we can config ignored directories, but it doesn't work for subdirectories.