Commits

Toby Davies  committed e6558c3

new servers

  • Participants
  • Parent commits b33eac2

Comments (0)

Files changed (2)

 CLIENT_RETRY_DELAY='0.1'
 typeset -A host_colours
 host_colours=(
-    vimes green
-    onyx red
-    edoras yellow
-    isenguard cyan
-    isenguard2 magenta
-    jasper grey
-    IT8-kubuntu green
+    vimes                      green
+    main                       red
+    testing                    yellow
+    tobyodavies-biarri-laptop  green
 )
 
 host_colour=${host_colours[$HOST]-"cyan"};
-#!/bin/bash
-if [ $# -ne 3 ]; then
-   echo Usage: $0 local base other
+#!/usr/bin/zsh
+
+
+if [ $# -ne 4 ]; then
+   echo Usage: $0 local other base output
    exit 1
 fi
-emacs --eval '(ediff-merge-with-ancestor "'$1'" "'$2'" "'$3'")' 
 
+LOCAL="$1"
+BASE="$2"
+OTHER="$3"
+OUTPUT="$4"
+
+BACKUP="$LOCAL.orig"
+
+cp $LOCAL $BACKUP
+
+emacsclient --eval '(ediff-merge-with-ancestor "'$LOCAL'" "'$OTHER'" "'$BASE'" nil "'$OUTPUT'")' 
+