A simple wrapper around diff3 that allows the user to handle conflicts by choosing one version or another
Ruby
Switch branches/tags
Nothing to show
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Failed to load latest commit information.
README.md
diff3-interactive.rb

README.md

diff3-interactive

A simple script to make merging files easier. Utilises the GNU diff3 utility to generate a 3-way diff of the file, then in the case of conflicts prompts the user for the version they'd like to use.