Setting 'zdiff3' in global gitconfig causes guix pull to fail

  • Open
  • quality assurance status badge
Details
One participant
  • guix
Owner
unassigned
Submitted by
guix
Severity
normal
G
G
guix wrote on 1 Sep 20:14 +0200
(address . bug-guix@gnu.org)
bd7f7978-51dd-40c0-8a8f-7e9a76ad339f@alethk.it
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'
receiving objects 34% [################################# ] indexing
objects 31% [############################### ] guix pull: error: Git
error: unknown style 'zdiff3' given for 'merge.conflictstyle'
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 72942@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 72942
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch