diff options
Diffstat (limited to '.SRCINFO')
| -rw-r--r-- | .SRCINFO | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -1,10 +1,10 @@ # Generated by mksrcinfo v8 -# Sat Jan 30 19:39:08 UTC 2016 -pkgbase = resolve-trivial-conflicts-git +# Wed Mar 8 13:38:23 UTC 2017 +pkgbase = git-mediate-git pkgdesc = Resolve trivial conflicts automatically when merging branches in git repositories. - pkgver = r70.84d10f2 + pkgver = r94.07b1a7b pkgrel = 1 - url = https://github.com/ElastiLotem/resolve-trivial-conflicts + url = https://github.com/Peaker/git-mediate arch = i686 arch = x86_64 license = GPL @@ -12,10 +12,14 @@ pkgbase = resolve-trivial-conflicts-git makedepends = cabal-install makedepends = chrpath depends = gmp - provides = resolve-trivial-conflicts + depends = libffi + provides = git-mediate + conflicts = git-mediate conflicts = resolve-trivial-conflicts - source = git+https://github.com/ElastiLotem/resolve-trivial-conflicts + replaces = resolve-trivial-conflicts + replaces = resolve-trivial-conflicts-git + source = git+https://github.com/Peaker/git-mediate md5sums = SKIP -pkgname = resolve-trivial-conflicts-git +pkgname = git-mediate-git |