Package: git-core Version: 1:1.5.1.1-1 Severity: wishlist As of now, the conflict markers generated by merges sometimes include only a relative symbolic name such as "HEAD". A SHA1 should also always be included, so that months later the marker is still meaningful.
Bart Massey [EMAIL PROTECTED] -- System Information: Debian Release: lenny/sid APT prefers unstable APT policy: (495, 'unstable') Architecture: i386 (i686) Kernel: Linux 2.6.18-4-686 (SMP w/1 CPU core) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages git-core depends on: ii libc6 2.5-7 GNU C Library: Shared libraries ii libcurl3-gnutls 7.15.5-1 Multi-protocol file transfer libra ii libdigest-sha1-perl 2.11-2 NIST SHA-1 message digest algorith ii liberror-perl 0.15-8 Perl module for error/exception ha ii libexpat1 1.95.8-3.4 XML parsing C library - runtime li ii perl-modules 5.8.8-7 Core Perl modules ii zlib1g 1:1.2.3-13 compression library - runtime Versions of packages git-core recommends: ii curl 7.15.5-1 Get a file from an HTTP, HTTPS, FT pn git-doc <none> (no description available) ii less 394-4 Pager program similar to more ii openssh-client [ssh-client] 1:4.3p2-10 Secure shell client, an rlogin/rsh ii patch 2.5.9-4 Apply a diff file to an original ii rsync 2.6.9-3 fast remote file copy program (lik -- no debconf information -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]