Package: git-core
Version: 1:1.7.0-1
Severity: normal
I can't live without conflictstyle=diff3m and I'm very happy it exists.
But it has a little problem: it uses "|||||||\n" as a separator for the
ancestor version of the text, whereas diff3 uses "||||||| <ancestorname>\n".
The difference is harmless for a human (tho the <ancestorname> can sometimes
be useful, assuming it's meaningful), but it makes some tools fail to
recognize the conflict markers properly.
So please add a " BASE" or " ANCESTOR" after the "|||||||".
Stefan
PS: I intended to report this bug directly to the Git bug-tracker, but I was
simply unable to find it. I know I'm sometimes dense, but I did make an
honest effort to look for it.
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1,
'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.30-2-686 (SMP w/2 CPU cores)
Locale: LANG=fr_CH.UTF-8, LC_CTYPE=fr_CH.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-core depends on:
ii libc6 2.10.2-6 Embedded GNU C Library: Shared lib
ii libcurl3-gnutls 7.19.7-1 Multi-protocol file transfer libra
ii libdigest-sha1-perl 2.12-1 NIST SHA-1 message digest algorith
ii liberror-perl 0.17-1 Perl module for error/exception ha
ii libexpat1 2.0.1-7 XML parsing C library - runtime li
ii perl-modules 5.10.1-11 Core Perl modules
ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime
Versions of packages git-core recommends:
ii less 436-1 pager program similar to more
ii openssh-client [ssh-client] 1:5.3p1-1 secure shell (SSH) client, for sec
ii patch 2.6-2 Apply a diff file to an original
ii rsync 3.0.7-2 fast remote file copy program (lik
Versions of packages git-core suggests:
ii git-arch 1:1.7.0-1 fast, scalable, distributed revisi
ii git-cvs 1:1.7.0-1 fast, scalable, distributed revisi
pn git-daemon-run <none> (no description available)
ii git-doc 1:1.7.0-1 fast, scalable, distributed revisi
pn git-email <none> (no description available)
pn git-gui <none> (no description available)
ii git-svn 1:1.7.0-1 fast, scalable, distributed revisi
pn gitk <none> (no description available)
pn gitweb <none> (no description available)
-- no debconf information
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
