diff options
| -rw-r--r-- | lisp/magit-ediff.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/magit-ediff.el b/lisp/magit-ediff.el index d72c19a..5edfa94 100644 --- a/lisp/magit-ediff.el +++ b/lisp/magit-ediff.el @@ -293,6 +293,8 @@ range)." "Read file in REVB, return it and the corresponding file in REVA. When FILEB is non-nil, use this as REVB's file instead of prompting for it." + (when (equal revA "{worktree}") (setq revA nil)) + (when (equal revB "{worktree}") (setq revB nil)) (unless (and fileB (member fileB (magit-revision-files revB))) (setq fileB (or (and fileB |