From 6d2c6b7d98b3542db4d1442a14d3e05d097b29a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Vanicat?= Date: Mon, 2 Mar 2009 10:43:56 +0100 Subject: [PATCH] in interactive merge, rename ours to current and their to merged. When rebasing it's not clear which commit is ours, and which is theirs, the new name should be clearer. --- magit.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/magit.el b/magit.el index ffa8f11c..68e2e1e0 100644 --- a/magit.el +++ b/magit.el @@ -2873,8 +2873,8 @@ Prefix arg means justify as well." (defun magit-interactive-resolve (file) (let ((merge-status (magit-git-string "ls-files -u -- %s" file)) (base-buffer (generate-new-buffer (concat file ".base"))) - (our-buffer (generate-new-buffer (concat file ".ours"))) - (their-buffer (generate-new-buffer (concat file ".theirs"))) + (our-buffer (generate-new-buffer (concat file ".current"))) + (their-buffer (generate-new-buffer (concat file ".merged"))) (windows (current-window-configuration))) (if (null merge-status) (error "Cannot resolge %s" file))