comparison src/grapher.cpp @ 399:b1f0fa991c49 item_appearance_adjustments

Use circle presentation for uncommitted merge as well as merge changeset

 
         // If the uncommitted item has no parents on the same branch,
         // tell it it has a new branch (the "show branch" flag is set
         // elsewhere for this item)
         m_uncommitted->setIsNewBranch(!haveParentOnBranch);
+
+        // Uncommitted is a merge if it has more than one parent
+        m_uncommitted->setIsMerge(m_uncommittedParents.size() > 1);
     }
 
     // Add the branch labels
 
     foreach (Changeset *cs, csets) {