Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • meld meld
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 198
    • Issues 198
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 4
    • Merge requests 4
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • GNOMEGNOME
  • meldmeld
  • Issues
  • #47
Closed
Open
Issue created Oct 10, 2012 by Bugzilla@bugzilla-migration💬Reporter

[BZ#685889] support diff3 format files

Submitted by Gregor B. Rosenauer

Link to original bug (#685889)

Description

sometimes it's already too late to use meld, and you end up with conflict markers in your file(s), like >>>> HEAD and <<< REV x.

For these cases, it would be nice if meld detected the diff3 format markers and automatically show me the common ancestor, local and remote version in a 3-way-merge-view instead of everything in one file.

I'd highly appreciate such a feature, as I think meld is currently the best merge tool available (the interface is way better than kdiff3's, much more like the Eclipse merge view which I find excellent) and often use it with git.

Assignee
Assign to
Time tracking