diff options
author | Akinori MUSHA <knu@FreeBSD.org> | 2007-01-18 13:23:33 +0000 |
---|---|---|
committer | Akinori MUSHA <knu@FreeBSD.org> | 2007-01-18 13:23:33 +0000 |
commit | df53e0b0f1c314a65f78ac79ed9670b15080de4c (patch) | |
tree | aaf552f36a0c652cb34815d30ba3d4820b59cf4c /misc/Makefile | |
parent | a61ee8a9e11a2f04a72e9068347e8455e0e2e189 (diff) |
Add imerge(1), a tool to help merge one file to another interactively.
This utility was (obviously) inspired by the mergemaster utility in
hope of using part of its functionality stand-alone.
Notes
Notes:
svn path=/head/; revision=182726
Diffstat (limited to 'misc/Makefile')
-rw-r--r-- | misc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/misc/Makefile b/misc/Makefile index 7b3b708874bd..d5c2ceea9a50 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -155,6 +155,7 @@ SUBDIR += histring SUBDIR += hotkeys SUBDIR += hulgalugha + SUBDIR += imerge SUBDIR += inplace SUBDIR += instant-server SUBDIR += instant-tinderbox |