From: Tony Lindgren <tony@atomide.com>
To: David Brownell <david-b@pacbell.net>
Cc: linux-omap-open-source@linux.omap.com
Subject: Re: [PATCH] Re-add a lost TSC2102 touchscreen Kconfig entry
Date: Wed, 23 May 2007 08:41:00 -0700 [thread overview]
Message-ID: <20070523154059.GE26513@atomide.com> (raw)
In-Reply-To: <200705221640.51098.david-b@pacbell.net>
* David Brownell <david-b@pacbell.net> [070522 16:42]:
> On Tuesday 22 May 2007, andrzej zaborowski wrote:
> > The TSC2102 option in drivers/input/touchscreen/Kconfig got lost
> > somewhere in January (although the commit is not visible in git-web),
> > so adding it back.
>
> I noticed that ...
The git automerge has been causing issues... And I may have missed
something with manual merges.
The manual merge issues are mostly solved now in git 1.5, as
git-mergetool is able to use kdiff3 to resolve conflicts.
To use it, just git-mergetool on that file while merging,
thanks again Paul for the tip!
Regards,
Tony
next prev parent reply other threads:[~2007-05-23 15:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-22 17:22 [PATCH] Re-add a lost TSC2102 touchscreen Kconfig entry andrzej zaborowski
2007-05-22 23:40 ` David Brownell
2007-05-23 15:41 ` Tony Lindgren [this message]
2007-05-23 23:54 ` andrzej zaborowski
2007-05-25 0:31 ` Tony Lindgren
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=20070523154059.GE26513@atomide.com \
--to=tony@atomide.com \
--cc=david-b@pacbell.net \
--cc=linux-omap-open-source@linux.omap.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 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.