When Git cannot automatically resolve conflicts it writes a file with conflict markers surrounding the conflicting areas. These conflicts must be resolved manually. This is often done via a three-way ...
Modify git mergetool vimdiff's BAD UI(UI changes when git's BASE dosen't exist).
Some results have been hidden because they may be inaccessible to you
Show inaccessible results
Feedback