On Sat, Feb 14, 2009 at 5:21 PM, Jeff King <peff@xxxxxxxx> 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 <felipe.contreras@xxxxxxxxx> >> --- >> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
