GNU bug report logs - #72942
Setting 'zdiff3' in global gitconfig causes guix pull to fail

Previous Next

Package: guix;

Reported by: guix <at> alethk.it

Date: Sun, 1 Sep 2024 21:48:04 UTC

Severity: normal

To reply to this bug, email your comments to 72942 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to bug-guix <at> gnu.org:
bug#72942; Package guix. (Sun, 01 Sep 2024 21:48:04 GMT) Full text and rfc822 format available.
Acknowledgement sent to guix <at> alethk.it:
New bug report received and forwarded. Copy sent to bug-guix <at> gnu.org. (Sun, 01 Sep 2024 21:48:04 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: guix <at> alethk.it
To: bug-guix <at> gnu.org
Subject: Setting 'zdiff3' in global gitconfig causes guix pull to fail
Date: Sun, 1 Sep 2024 20:14:36 +0200

A minimal log:

hint: Consider installing the `glibc-locales' package and defining 
`GUIX_LOCPATH', along these lines: guix install glibc-locales export 
GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" See the "Application 
Setup" section in the manual, for more info. Updating channel 'guix' 
from Git repository at 'https://git.savannah.gnu.org/git/guix.git'... 
receiving objects 34% [################################# ] indexing 
objects 31% [############################### ] guix pull: error: Git 
error: unknown style 'zdiff3' given for 'merge.conflictstyle'
This bug report was last modified 344 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.