From 3065125d314a4cb97aa7982e2d06f48759865af7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sun, 18 Jan 2015 00:06:13 +0100 Subject: [PATCH] Fix mistake in rebase/merge conflict resolution. Remove lines from lisp/vc/vc-bzr.el again that were accidentally restored in commit 2015-01-17T09:56:45!ulm@gentoo.org. (Previously removed in commit 2014-12-01T13:24:27Z!esr@thyrsus.com.) --- lisp/vc/vc-bzr.el | 3 --- 1 file changed, 3 deletions(-) diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 94574fdec62..96d6d1da48c 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -493,9 +493,6 @@ in the branch repository (or whose status not be determined)." (add-hook 'after-save-hook 'vc-bzr-resolve-when-done nil t) (message "There are unresolved conflicts in this file"))) -(defun vc-bzr-workfile-unchanged-p (file) - (eq 'unchanged (car (vc-bzr-status file)))) - (defun vc-bzr-version-dirstate (dir) "Try to return as a string the bzr revision ID of directory DIR. This uses the dirstate file's parent revision entry. -- 2.39.5