emerge-hack: A new script for Git merging.

[profile] / setup

diff --git a/setup b/setup
index 47eac252703a5b645e6f9f24ca4ca3db65a06867..8ca3066ee490b670659fc7df16081bfe74cb5510 100755 (executable)
--- a/setup
+++ b/setup
@@ -179,7 +179,8 @@ echo "      all done."
 
 ### Install useful scripts included in this package
 scripts="
-  mdw-editor"
+  mdw-editor
+  emerge-hack"
 echo "Installing scripts..."
 mkdir -p $HOME$sub/bin
 for s in $scripts; do