From: Marc Singer <elf@buici.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Why would merge fail on a one-line addition?
Date: Sat, 25 Mar 2006 14:26:01 -0800 [thread overview]
Message-ID: <20060325222601.GA1500@buici.com> (raw)
One of the unmerged files leaves this trail.
elf@florence ~...git/linux-2.6 > git-ls-files --unmerged
100644 6262d449120cdcde5db1b079806dcc0d9b5e6b7c 1 arch/arm/mach-lh7a40x/irq-lpd7a40x.c
100644 dcb4e17b941990eabe8992680c9aa9b67afb6fd4 3 arch/arm/mach-lh7a40x/irq-lpd7a40x.c
elf@florence ~...git/linux-2.6 > git-cat-file blob 6262d449120cdcde5db1b079806dcc0d9b5e6b7c > a
elf@florence ~...git/linux-2.6 > git-cat-file blob dcb4e17b941990eabe8992680c9aa9b67afb6fd4 > b
elf@florence ~...git/linux-2.6 > diff a b 21a22
> #include "common.h"
Why would git have a problem with this?
next reply other threads:[~2006-03-25 22:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-25 22:26 Marc Singer [this message]
2006-03-26 0:31 ` Why would merge fail on a one-line addition? Linus Torvalds
2006-03-26 1:32 ` Junio C Hamano
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=20060325222601.GA1500@buici.com \
--to=elf@buici.com \
--cc=git@vger.kernel.org \
/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.