[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, 2.2.9_release_candidate, updated. surfraw_2-2-5_1-250-g994e65a

[Jason Ryan]

The following commit has been merged in the 2.2.9_release_candidate branch:
commit 994e65ae1bd49f41a4e0961a1f761c79ac4b6ce4
Merge: 0b70919e5f854c6bd4096d3d27d5edc55eb50649 b48e0cb4501ef103afbb91976f4bad2e7bd76a10
Author: Jason Ryan <jasonwryan at gmail.com>
Date:   Tue Oct 23 16:35:56 2012 +1300

    Merged cite.test conflict

diff --combined test/cite.test
index 586b2c2,24b5d23..91f3cd0
--- a/test/cite.test
+++ b/test/cite.test
@@@ -1,4 -1,5 +1,5 @@@
  cite functional
 -Results.*1 - 10
 +Results <strong>1 - 
  cite -auth knuth
 +Results <strong>1 - 
+ Results.*1 - 10
 -

-- 
surfraw -  a fast unix command line interface to WWW