Jeff King <peff@xxxxxxxx> writes: > My big challenge now will be remembering to try to use this next time I > run into a conflict that could be helped by it. :) Yup, I installed it in ~/bin so that I can pipe diff3 result to it for the next time. Thanks.
