gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix "resolge" type in error message.

Browse source
This commit is contained in:
Marius Vollmer 2009-07-15 00:48:26 +03:00
parent bd8fca2fb7
commit 06675c5b7d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
magit.el
View file

@ -3102,7 +3102,7 @@ Prefix arg means justify as well."
(their-buffer (generate-new-buffer (concat file ".merged")))
(windows (current-window-configuration)))
(if (null merge-status)
(error "Cannot resolge %s" file))
(error "Cannot resolve %s" file))
(with-current-buffer base-buffer
(if (string-match "^[0-9]+ [0-9a-f]+ 1" merge-status)
(insert (magit-git-string "cat-file blob :1:%s" file))))