unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: guix@alethk.it
To: 72942@debbugs.gnu.org
Subject: bug#72942: Setting 'zdiff3' in global gitconfig causes guix pull to fail
Date: Sun, 1 Sep 2024 20:14:36 +0200	[thread overview]
Message-ID: <bd7f7978-51dd-40c0-8a8f-7e9a76ad339f@alethk.it> (raw)

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'





                 reply	other threads:[~2024-09-01 22:18 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bd7f7978-51dd-40c0-8a8f-7e9a76ad339f@alethk.it \
    --to=guix@alethk.it \
    --cc=72942@debbugs.gnu.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.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).