aboutsummaryrefslogtreecommitdiffstats
path: root/misc/imerge
Commit message (Collapse)AuthorAgeFilesLines
* Add imerge(1), a tool to help merge one file to another interactively.knu2007-01-183-0/+38
This utility was (obviously) inspired by the mergemaster utility in hope of using part of its functionality stand-alone.