summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PKGBUILD8
1 files changed, 5 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 5e48a1d0ac70..96e81e9e2c28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,14 +11,16 @@ groups=()
depends=(
'bash'
'coreutils'
- 'git'
'pacman'
'sed'
'tar'
)
optdepends=(
- 'meld: default merge tool'
- 'vim: default merge tool'
+ 'git: default merge tool'
+ 'rcs: default merge tool'
+ 'kdiff3: default resolve tool'
+ 'meld: default resolve tool'
+ 'vim: default resolve tool'
)
makedepends=('git' 'asciidoctor')
provides=("$_pkgname")