diff options
| author | Gustav Hållberg <gustav@gmail.com> | 2012-04-06 21:32:40 +0200 |
|---|---|---|
| committer | Gustav Hållberg <gustav@gmail.com> | 2012-04-09 09:23:27 +0200 |
| commit | 55deb9290c6bbf8121667028912668d4d3a4570a (patch) | |
| tree | 6f734bb13b66bba4cb138b712a3654ee9045dbb3 | |
| parent | fc6a66e8c6b77ba7aacd47f5205bb53927ec6949 (diff) | |
| download | stgit-55deb9290c6bbf8121667028912668d4d3a4570a.tar.gz | |
stgit.el: Set file names when calling smerge-ediff
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
| -rw-r--r-- | contrib/stgit.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/stgit.el b/contrib/stgit.el index 5d473f8..e3ffcb4 100644 --- a/contrib/stgit.el +++ b/contrib/stgit.el @@ -1196,7 +1196,9 @@ With prefix argument, open a buffer with that revision of the file." (interactive) (stgit-assert-mode) (stgit-find-file t) - (smerge-ediff)) + (let ((filename (file-name-nondirectory buffer-file-name))) + (smerge-ediff (concat "*" filename " GIT*") + (concat "*" filename " PATCH*")))) (defun stgit-quit () "Hide the stgit buffer." |