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.
vitei/diff3-interactive
Folders and files
| Name | Name | Last commit date | ||
|---|---|---|---|---|