@@ -28,7 +28,7 @@
[merge]
conflictstyle = diff3
[gpg]
- program = /usr/bin/gpg
+ program = /usr/local/bin/gpg
[status]
showUntrackedFiles = all
[transfer]
