pestctrl/emacs-config
1
0
Fork 0
mirror of https://github.com/pestctrl/emacs-config.git synced 2026-06-14 12:21:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Jeeeeeez that's a bug

Browse source
This commit is contained in:
Benson Chu 2022-12-09 11:55:42 -06:00
parent f61f6ad06d
commit b5a5684294
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/git-auto-sync/git-auto-fast-forward-mode.el
View file

@ -91,7 +91,7 @@
(when (not (zerop (shell-command (format "git merge --ff-only %s" b) output-buffer)))
(when (not my/puppet-p)
(pop-to-buffer output-buffer))
(message "Merging to branch '%s' in repo '%s' failed" b dir)))))
(message "Merging to branch '%s' in repo '%s' failed" b repo)))))
(magit-push-current-to-pushremote nil)))
(load "userlock")