Figure 4. Branching, and Merging, and Shelving, Oh My! Merge two files easily using the built-in merge tool or supply your own merge tool. The top windows represent the two source files, and the bottom window represents a view of the final merged file.