From 95df7717c3e845dd32449f1da8231986a7ca403a Mon Sep 17 00:00:00 2001
From: lkassianik <lyubakassianik@gmail.com>
Date: Tue, 11 Nov 2014 18:25:19 -0800
Subject: [PATCH] Ref T6500, Duplicated tasks should be marked more visibly as
 duplicates

Summary: When merging tasks, the corresponding transaction on the merged task should be black, and the transaction on the ultimate task should be green.

Test Plan: Create two tasks, merge one into the other, merged task transaction is black, the surviving task should show a green transaction.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: chad, Korvin, epriestley

Maniphest Tasks: T6500

Differential Revision: https://secure.phabricator.com/D10827
---
 .../maniphest/storage/ManiphestTransaction.php             | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/applications/maniphest/storage/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php
index 69ba720d29..a61f43fd0a 100644
--- a/src/applications/maniphest/storage/ManiphestTransaction.php
+++ b/src/applications/maniphest/storage/ManiphestTransaction.php
@@ -213,6 +213,11 @@ final class ManiphestTransaction
           return 'yellow';
         }
 
+      case self::TYPE_MERGED_FROM:
+        return 'orange';
+
+      case self::TYPE_MERGED_INTO:
+        return 'black';
     }
 
     return parent::getColor();
@@ -591,7 +596,7 @@ final class ManiphestTransaction
 
       case self::TYPE_MERGED_INTO:
         return pht(
-          '%s merged this task into %s.',
+          '%s closed this task as a duplicate of %s.',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($new));
         break;