blob: 265f55153470515ec435e58884294f12b6387d4c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
|
pkgbase = resolve-trivial-conflicts-git
pkgdesc = Resolve trivial conflicts automatically when merging branches in git repositories.
pkgver = r52.48ae21a
pkgrel = 1
url = https://github.com/ElastiLotem/resolve-trivial-conflicts
arch = i686
arch = x86_64
license = GPL
makedepends = git
makedepends = cabal-install
makedepends = chrpath
depends = gmp
provides = resolve-trivial-conflicts
conflicts = resolve-trivial-conflicts
source = git+https://github.com/ElastiLotem/resolve-trivial-conflicts
md5sums = SKIP
pkgname = resolve-trivial-conflicts-git
|