From owner-cvs-ports@FreeBSD.ORG  Thu Jan 18 13:23:34 2007
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
X-Original-To: cvs-ports@FreeBSD.org
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 600B716A40F;
	Thu, 18 Jan 2007 13:23:34 +0000 (UTC) (envelope-from knu@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 38CC013C442;
	Thu, 18 Jan 2007 13:23:34 +0000 (UTC) (envelope-from knu@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0IDNYeN096214;
	Thu, 18 Jan 2007 13:23:34 GMT (envelope-from knu@repoman.freebsd.org)
Received: (from knu@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0IDNYKk096213;
	Thu, 18 Jan 2007 13:23:34 GMT (envelope-from knu)
Message-Id: <200701181323.l0IDNYKk096213@repoman.freebsd.org>
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Thu, 18 Jan 2007 13:23:34 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/misc Makefile ports/misc/imerge Makefile
 distinfo pkg-descr
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Jan 2007 13:23:34 -0000

knu         2007-01-18 13:23:34 UTC

  FreeBSD ports repository

  Modified files:
    misc                 Makefile 
  Added files:
    misc/imerge          Makefile distinfo pkg-descr 
  Log:
  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.
  
  Revision  Changes    Path
  1.835     +1 -0      ports/misc/Makefile
  1.1       +27 -0     ports/misc/imerge/Makefile (new)
  1.1       +3 -0      ports/misc/imerge/distinfo (new)
  1.1       +8 -0      ports/misc/imerge/pkg-descr (new)