From: Jan Kratochvil <jan@jankratochvil.net>
Date: Fri, 10 Nov 2023 14:47:23 +0000 (+0800)
Subject: +bin/vi-git-both-modified
X-Git-Url: http://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=7ce1484636644daf7e0974c17fc0b32581114d2c

+bin/vi-git-both-modified
---

diff --git a/bin/vi-git-both-modified b/bin/vi-git-both-modified
new file mode 100755
index 0000000..8f47892
--- /dev/null
+++ b/bin/vi-git-both-modified
@@ -0,0 +1,15 @@
+#! /bin/bash
+fis=""
+for fi in $(git status|sed -n 's/^	both modified: *//p');do
+  if ! grep -q '^<<<<<<< ' $fi;then
+    git add $fi
+    continue
+  fi
+  fis="$fis $fi"
+done
+if [ -z "$fis" ];then
+  echo done
+  exit 0
+fi
+set -x
+exec vim $fis