From: Felipe Contreras Date: Sat, 14 Feb 2009 15:24:47 GMT Subject: Re: [PATCH v2] config: Use parseopt. Message-ID: <94a0d4530902140724m72fdb47bt7fead5dc22733299@mail.gmail.com> In-Reply-To: <20090214152155.GD3887@sigill.intra.peff.net> On Sat, Feb 14, 2009 at 5:21 PM, Jeff King wrote: > On Sat, Feb 14, 2009 at 02:03:09PM +0200, Felipe Contreras wrote: > >> Reorganizing the code to use parseopt as suggested by Johannes >> Schindelin. >> >> Signed-off-by: Felipe Contreras >> --- >> builtin-config.c | 370 ++++++++++++++++++++++++++--------------------------- >> 1 files changed, 182 insertions(+), 188 deletions(-) > > What is this built on top of? I get very large conflicts applying it on > top of Junio's "master". By mistake I used a dirty master branch, but it should apply on top of 'pu'. -- Felipe Contreras