Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Merge requests
!81121
community/mergiraf: upgrade to 0.6.0
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
community/mergiraf: upgrade to 0.6.0
strophy/aports:mergiraf-0.6.0
into
master
Overview
0
Commits
1
Pipelines
2
Changes
1
Merged
strophy
requested to merge
strophy/aports:mergiraf-0.6.0
into
master
2 weeks ago
Overview
0
Commits
1
Pipelines
2
Changes
1
Expand
0
0
Merge request reports
Compare
master
version 1
909d4608
2 weeks ago
master (base)
and
latest version
latest version
d060e0e3
1 commit,
2 weeks ago
version 1
909d4608
1 commit,
2 weeks ago
1 file
+
2
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
community/mergiraf/APKBUILD
+
2
−
2
Options
# Maintainer: omni <omni+alpine@hack.org>
maintainer
=
"omni <omni+alpine@hack.org>"
pkgname
=
mergiraf
pkgver
=
0.
5.1
pkgver
=
0.
6.0
pkgrel
=
0
pkgdesc
=
"syntax-aware git merge driver for a growing collection of programming languages and file formats"
arch
=
"all"
@@ -51,5 +51,5 @@ package() {
}
sha512sums
=
"
f2aa3c1610b83fbc322b37a48dff46213b2ed84905e51c5f526cf12bd2d0c46d058291e2c631bfcc901ee031fdff8326900dc3c57c0a4acc8fd6592069308f74
mergiraf-0.
5.1
.tar.gz
d0a1c7db7fd04402808cc7e0c423ecf1ba539585a376c638a1c371f7d63a8eb5e36b1147754af20b35b953251472e5f36a8453ea59b9ded4abe5fdc6b67c5d0b
mergiraf-0.
6.0
.tar.gz
"
Loading