diff --git a/tools/dmitool/git_merge_installer.sh b/tools/dmitool/git_merge_installer.sh
new file mode 100755
index 0000000000..e0c48823b1
--- /dev/null
+++ b/tools/dmitool/git_merge_installer.sh
@@ -0,0 +1,6 @@
+F="../../.git/config"
+
+echo '' >> $F
+echo '[merge "merge-dmi"]' >> $F
+echo '	name = iconfile merge driver' >> $F
+echo '	driver = ./tools/dmitool/dmimerge.sh %O %A %B' >> $F
diff --git a/tools/dmitool/merging.txt b/tools/dmitool/merging.txt
index f4056aa8cf..639a634bfb 100644
--- a/tools/dmitool/merging.txt
+++ b/tools/dmitool/merging.txt
@@ -8,7 +8,7 @@ The easiest way to do merging is to install the merge driver. For this, open `Ba
 	name = iconfile merge driver
 	driver = ./tools/dmitool/dmimerge.sh %O %A %B
 
-You may optionally instead run git_merge_installer.bat which should automatically insert these lines for you at the appropriate location.
+You may optionally instead run git_merge_installer.bat or git_merge_installer.sh which should automatically insert these lines for you at the appropriate location.
     
 After this, merging DMI files should happen automagically unless there are conflicts (an icon_state that both you and someone else changed).
-If there are conflicts, you will unfortunately still be stuck with opening both versions in the editor, and manually resolving the issues with those states.
\ No newline at end of file
+If there are conflicts, you will unfortunately still be stuck with opening both versions in the editor, and manually resolving the issues with those states.
diff --git a/tools/mapmerge/git_merge_installer.sh b/tools/mapmerge/git_merge_installer.sh
new file mode 100755
index 0000000000..c6d70bc0c9
--- /dev/null
+++ b/tools/mapmerge/git_merge_installer.sh
@@ -0,0 +1,6 @@
+F="../../.git/config"
+
+echo '' >> $F
+echo '[merge "merge-dmm"]' >> $F
+echo '	name = mapmerge driver' >> $F
+echo '	driver = ./tools/mapmerge/mapmerge.sh %O %A %B' >> $F
diff --git a/tools/mapmerge/install.txt b/tools/mapmerge/install.txt
index 9ff667f0b1..943b195b5e 100644
--- a/tools/mapmerge/install.txt
+++ b/tools/mapmerge/install.txt
@@ -14,6 +14,6 @@ The easiest way to do merging is to install the merge driver. For this, open `Ba
 	name = mapmerge driver
 	driver = ./tools/mapmerge/mapmerge.sh %O %A %B
 
-You may optionally instead run git_merge_installer.bat which should automatically insert these lines for you at the appropriate location.
+You may optionally instead run git_merge_installer.bat or git_merge_installer.sh which should automatically insert these lines for you at the appropriate location.
     
 After this, merging maps should happen automagically unless there are conflicts(a tile that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in a map editor, and manually resolving the issues.