From 06675c5b7dc9108a05f73823820b490efbfd6224 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Wed, 15 Jul 2009 00:48:26 +0300 Subject: [PATCH] Fix "resolge" type in error message. --- magit.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magit.el b/magit.el index 063468b3..0ac85ad7 100644 --- a/magit.el +++ b/magit.el @@ -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))))