From: David Aguilar <davvid@gmail.com>
To: Seth House <seth@eseth.com>
Cc: git@vger.kernel.org
Subject: Re: Conflict markers in mergetool $LOCAL ?
Date: Tue, 17 Aug 2010 02:32:47 -0700 [thread overview]
Message-ID: <20100817093246.GB26357@gmail.com> (raw)
In-Reply-To: <20100817093008.GA26357@gmail.com>
On Tue, Aug 17, 2010 at 02:30:23AM -0700, David Aguilar wrote:
> On Tue, Aug 17, 2010 at 04:34:20AM +0000, Seth House wrote:
> > [...]
> > For small conflicts, I like the conflict markers and simply editing the
> > conflicted file with Vim. For files with lots of conflicts I would like to use
> > vimdiff but I wouldn't expect the conflict markers to appear there -- it's
> > redundant information in a 3-way merge.
> >
> > Is there a better Git Way (TM) that I'm missing? Is my Git setup borked
> > somehow?
> >
> > I have the following in my ~/.gitconfig and a stock Git installation on Arch
> > Linux.
> >
> > [merge]
> > tool = vimdiff
>
>
> What happens if you remove this section?:
>
> > [mergetool "vimdiff"]
> > cmd = vimdiff
> > trustExitCode = true
>
> mergetool has built-in support for vimdiff.
> You shouldn't need to define mergetool.vimdiff.cmd.
Typo, ^^^^^^^^^^^^^^^^^^^^^
Should say: mergetool.cmd.vimdiff
--
David
next prev parent reply other threads:[~2010-08-17 9:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-17 4:34 Conflict markers in mergetool $LOCAL ? Seth House
2010-08-17 9:30 ` David Aguilar
2010-08-17 9:32 ` David Aguilar [this message]
2010-08-17 17:08 ` Seth House
2010-08-17 18:00 ` Jacob Helwig
2010-08-17 21:04 ` Seth House
2010-08-17 21:24 ` Charles Bailey
2010-08-18 3:22 ` Seth House
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=20100817093246.GB26357@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=seth@eseth.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).