From 2751c1c3adf1d3140ae9b63bc399f998bb45cd1b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 23 Oct 2018 19:26:37 +0200
Subject: git-preview: add GIT_PREVIEW_MERGE_STRATEGY

---
 krebs/5pkgs/simple/git-preview/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/krebs/5pkgs/simple/git-preview/default.nix b/krebs/5pkgs/simple/git-preview/default.nix
index 77826f34b..da1525072 100644
--- a/krebs/5pkgs/simple/git-preview/default.nix
+++ b/krebs/5pkgs/simple/git-preview/default.nix
@@ -9,7 +9,11 @@ writeDashBin "git-preview" ''
   preview_name=$(${coreutils}/bin/basename "$preview_dir")
   ${git}/bin/git worktree add --detach -f "$preview_dir" 2>/dev/null
   ${git}/bin/git -C "$preview_dir" checkout -q "$head_commit"
-  ${git}/bin/git -C "$preview_dir" merge -qm "$merge_message" "$merge_commit"
+  ${git}/bin/git -C "$preview_dir" merge \
+      ''${GIT_PREVIEW_MERGE_STRATEGY+-s "$GIT_PREVIEW_MERGE_STRATEGY"} \
+      -m "$merge_message" \
+      -q \
+      "$merge_commit"
   ${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@"
   ${coreutils}/bin/rm -fR "$preview_dir"
   ${coreutils}/bin/rm -R .git/worktrees/"$preview_name"
-- 
cgit v1.2.3