Re: [PATCH] git-mergetool: add support for ediff

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Sam Vilain
Date: Monday, July 2, 2007 - 11:27 pm

Theodore Tso wrote:

Ouch.  Yes, I've never seen that before and no doubt if I had've I'd
feel the same way.  I just save the merge buffer and quit, and it is
pretty obedient for me.

However I guess it wouldn't be nice to have a merge mode that did not
work out of the box for a large number of users.

Your .el file certainly does the trick for me - I reckon throw it in
contrib/

Sam.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] git-mergetool: add support for ediff, Sam Vilain, (Thu Jun 28, 6:00 pm)
Re: [PATCH] git-mergetool: add support for ediff, Jason Sewall, (Thu Jun 28, 6:31 pm)
Re: [PATCH] git-mergetool: add support for ediff, Theodore Tso, (Thu Jun 28, 9:03 pm)
Re: [PATCH] git-mergetool: add support for ediff, Theodore Tso, (Sun Jul 1, 7:04 pm)
Re: [PATCH] git-mergetool: add support for ediff, Junio C Hamano, (Sun Jul 1, 7:32 pm)
Re: [PATCH] git-mergetool: add support for ediff, Theodore Tso, (Sun Jul 1, 8:05 pm)
Re: [PATCH] git-mergetool: add support for ediff, Junio C Hamano, (Sun Jul 1, 9:49 pm)
Re: [PATCH] git-mergetool: add support for ediff, Theodore Tso, (Mon Jul 2, 7:48 am)
Re: [PATCH] git-mergetool: add support for ediff, Sam Vilain, (Mon Jul 2, 2:32 pm)
Re: [PATCH] git-mergetool: add support for ediff, Theodore Tso, (Mon Jul 2, 2:58 pm)
Re: [PATCH] git-mergetool: add support for ediff, Theodore Tso, (Mon Jul 2, 3:16 pm)
Re: [PATCH] git-mergetool: add support for ediff, Sam Vilain, (Mon Jul 2, 4:19 pm)
Re: [PATCH] git-mergetool: add support for ediff, Theodore Tso, (Mon Jul 2, 6:09 pm)
Re: [PATCH] git-mergetool: add support for ediff, Sam Vilain, (Mon Jul 2, 11:27 pm)