Source of scripts

benedikt-schesch · Oct 4, 2023 · a1c7b49 · a1c7b49
1 parent 4aafb5c
commit a1c7b49
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/scripts/merge_tools/README b/src/scripts/merge_tools/README
@@ -0,0 +1,4 @@
+git-hires-merge is from https://github.com/paulaltin/git-hires-merge .
+
+resolve-adjacent-conflicts, resolve-conflicts.py, and resolve-import-conflicts
+are from https://github.com/plume-lib/manage-git-branches .