[meld] Remove accidentallty added RENAMED state
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Remove accidentallty added RENAMED state
- Date: Sat, 15 Jun 2013 22:34:57 +0000 (UTC)
commit 2bebd1dec9e20bf08795dc5491ef43d1764156ed
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Jun 16 08:33:29 2013 +1000
Remove accidentallty added RENAMED state
meld/vc/bzr.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index 0c9a24a..8e83d6a 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -42,7 +42,7 @@ class Vc(_vc.CachedVc):
CONFLICT_RE = "conflict in (.*)$"
commit_statuses = (
- _vc.STATE_MODIFIED, _vc.STATE_RENAMED, _vc.STATE_NEW, _vc.STATE_REMOVED
+ _vc.STATE_MODIFIED, _vc.STATE_NEW, _vc.STATE_REMOVED
)
conflict_map = {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]