Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • G gitlabhq1
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 21
    • Issues 21
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 12
    • Merge requests 12
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • gpt
  • large_projects
  • gitlabhq1
  • Merge requests
  • !705

Closed
Created Apr 20, 2012 by Administrator@rootOwner
  • Report abuse
Report abuse

Start the merge diff from the merge base.

  • Overview 5
  • Commits 1
  • Changes 1

Created by: arthurschreiber

This shows correct merge diffs, exactly in the way git will later handle merges.

The previous method sometimes showed changes in the diff that were just wrong.

(Basically, the diff shows now the output of git diff target_branch…source_branch).

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: github/fork/arthurschreiber/fix_merge_diffs