Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • P Pacman Contrib
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Graph
    • Compare
    • Locked Files
  • Issues 11
    • Issues 11
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Releases
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Pacman
  • Pacman Contrib
  • Merge requests
  • !18
The source project of this merge request has been removed.

pacdiff: add option to view diffs in 3-way fashion

Merged Ghost User requested to merge (removed):three-way-diff into master Jun 30, 2022
  • Overview 0
  • Pipelines 0
  • Changes 4

add -3/--threeway option to view diffs in 3-way fashion. this is similar to the 3-way merge, but instead of merging, it opens all three files in $diffprog.

if the previous package version of the candidate is not available in pacman's cache or if the file fails to extract, it falls back to regular 2-way diff.

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: three-way-diff