From: matthewt <matthewt@8a6f57db-631f-0410-b083-dc7c4259d016>
Date: Wed, 25 Jul 2012 11:37:46 +0000 (+0000)
Subject: quote - merge
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=69eb8a6d3a8c86b21eb28b2e68645b2a197d6492;p=scpubgit%2Fmst-quotefile.git

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
--- 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.