Re: [PATCH 5/5] Optionally work without python
From: Radoslaw Szkodzinski <hidden>
Date: 2016-06-15 22:42:19
Johannes Schindelin wrote:
In some setups (notably server setups) you do not need that dependency. Gracefully handle the absence of python when NO_PYTHON is defined.
+# Define NO_PYTHON if you want to loose all benefits of the recursive merge.
lose
quoted hunk ↗ jump to hunk
--- a/git-merge.sh +++ b/git-merge.sh@@ -11,7 +11,11 @@ LF=' ' all_strategies='recursive octopus resolve stupid ours'
Maybe use this: default_strategies='recursive' if test -n "@@NO_PYTHON@@"; then default_strategies='resolve' fi -- GPG Key id: 0xD1F10BA2 Fingerprint: 96E2 304A B9C4 949A 10A0 9105 9543 0453 D1F1 0BA2 AstralStorm
Attachments
- signature.asc [application/pgp-signature] 252 bytes