Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
meld
meld
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 148
    • Issues 148
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 4
    • Merge Requests 4
  • Registry
    • Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards

Getting colder with our second freeze... it's 3.31.91 release day and string freeze, upload a tarball and lock those strings 🏂

  • GNOME
  • meldmeld
  • Issues
  • #168

Closed
Open
Opened Mar 01, 2018 by tom@tom
  • Report abuse
  • New issue
Report abuse New issue

Can I tell which versions of a file actually differ in 3-way dir comparison?

Short: In the 3-way directory comparison is there a way to tell whether all three versions of a file differ from each other or if two of them are the same and just one is different?

Long: Thanks for Meld. It's great. I often use it before git merging/rebasing to evaluate changes and identify conflicts in advance. In that case I have:

  • left - my local version
  • middle - the base (common ancestor) version
  • right - their remote version

Modified files are displayed blue and bold. The version with the latest change has a yellow star attached to it. But is there a way to tell, whether all the three versions of a file differ from each other (i.e. potential conflict) or if two of them are the same and just one differs from them? (I mean right away - in the directory comparison view without the need to open the file.)

If this feature is not available yet, would it be possible to add it? I hope it wouldn't be too difficult.

Proposal: If two of the three versions of a file are identical and only one differs, they could all be blue (as they are now) but only the different version would be bold. The other two would have normal font-weight.

If all three versions differ from each other, display them all bold (as you do now). In this case I would even prefer if they could be displayed orange (or any other color) to emphasize the risk of a conflict. But that's not so important any more.

Thank you!!!

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
None
Due date
No due date
0
Labels
None
Assign labels
  • View project labels
Reference: GNOME/meld#168