]> scripts.mit.edu Git - wizard.git/search
Use diff3 conflict style, which gives more information.