Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update to 0.2.2. | Akinori MUSHA | 2008-10-27 | 2 | -4/+4 |
| | | | | Notes: svn path=/head/; revision=222120 | ||||
* | Add imerge(1), a tool to help merge one file to another interactively. | Akinori MUSHA | 2007-01-18 | 3 | -0/+38 |
This utility was (obviously) inspired by the mergemaster utility in hope of using part of its functionality stand-alone. Notes: svn path=/head/; revision=182726 |