quote - merge

git-svn-id: https://jules.scsys.co.uk/repository/shadowcat-code/scratchpad/matthewt/sig/lib@1300 8a6f57db-631f-0410-b083-dc7c4259d016

diff --git a/quotefile b/quotefile
index 81c0c63..8cf89ce 100644 (file)
--- a/quotefile
+++ b/quotefile
@@ -3680,3 +3680,8 @@ window and one xterm. Zero non-cat distractions.
  * quicksilver notices for the first time that therein is an anagram of neither
 <@SlayerXP> quicksilver: i was disappointed to notice that "I'm a 
             shiny-faced cunt" isn't an anagram of "David Cameron"
+%
+<@SlayerXP> a colleague appears to have just done a subversion merge by 
+            using the time honoured technique of copying everything he 
+            wanted to merge over the top of what he wanted to merge it to 
+            and then commiting.