Gentoo Archives: gentoo-dev

From: Matthew Schulkind <mschulkind@×××××.com>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] dispatch-conf merge option addition
Date: Wed, 25 Aug 2004 02:02:08
Message-Id: 396c8d67040824190227153b39@mail.gmail.com
1 Would anyone object to adding an option in the dispatch-conf.conf file
2 to select which merge program you'd like to use and what the
3 command-line format is?
4
5 I haven't quite worked out the format for the config file, but it
6 would probably be something like:
7 merge-util="merge-tool-command -o $1 $2 $3"
8
9 and $1 $2 $3 would be filled in with output file, original file, and
10 new file respectively.
11
12 -Matt Schulkind
13
14 --
15 gentoo-dev@g.o mailing list