Git merging using tools