From: Theodore Tso <tytso@mit.edu>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Add git-mergetool to run an appropriate merge conflict resolution program
Date: Thu, 29 Mar 2007 10:20:44 -0400 [thread overview]
Message-ID: <20070329142044.GH2913@thunk.org> (raw)
In-Reply-To: <7vabxwbszq.fsf@assigned-by-dhcp.cox.net>
On Wed, Mar 28, 2007 at 08:58:49PM -0700, Junio C Hamano wrote:
> I had a chance to use git-mergetool in real life for the first
> time today, when I merged 'maint' into 'master'. It has a
> symlink vs symlink conflict, so I got something like this:
>
> A few observations.
>
> (1) Saying "a" <Return> does not let me exit. It keeps asking
> the same question.
Yeah, I fixed that last night, along with a bunch of other git
mergetool cleanups. I was about to request you to do a pull when I
noticed your e-mail.
> (2) The word "symlink" might be less geekish if worded "symbolic
> link".
>
> (3) The message look very long, and repeats the same information.
>
> (4) The status info gives local and then remote, but the choice
> is between remote and local.
>
> The attached is a minimum fix for the above issues, but not for
> immediate application, as I am sure the rewording would make
> messages inconsistent with other cases.
OK, let me fix up the display and try to clean up the other messages.
I agree that your output looks much nicer.
- Ted
prev parent reply other threads:[~2007-03-29 14:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-06 5:07 [PATCH] Add git-mergetool to run an appropriate merge conflict resolution program Theodore Ts'o
2007-03-06 5:43 ` Junio C Hamano
2007-03-06 12:40 ` Theodore Tso
2007-03-06 22:55 ` Linus Torvalds
2007-03-06 23:02 ` Junio C Hamano
2007-03-29 3:58 ` Junio C Hamano
2007-03-29 14:20 ` Theodore Tso [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070329142044.GH2913@thunk.org \
--to=tytso@mit.edu \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.