# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1334265603 14400
# Node ID 8ecbfc2693e4aeccd696c2670f7325b66f911230
# Parent  5bf26d7a0c8a6c06bcdcb2898d0e5e877c0408f1# Parent  e23d3b14230bb2a0ca6918f09e8ebebaff44e66f
Merge.

diff -r e23d3b14230b -r 8ecbfc2693e4 .hgtags
--- a/.hgtags	Thu Apr 12 17:14:50 2012 -0400
+++ b/.hgtags	Thu Apr 12 17:20:03 2012 -0400
@@ -1,3 +1,3 @@
 fa37ec671fb5fe854e56c02616f9adcfd1003686 v1.0.0
 8de3ef182cb9b5d3a24853a4c12044d8b93c96a9 v1.1.0
-c91ebd7e656082750bf6ea990f297943af2ab6a0 v1.2.0
+7e3f6e97e92c71ad8517589bf1dbdc6fcaa28e91 v1.2.0
diff -r e23d3b14230b -r 8ecbfc2693e4 doc/clam.txt
--- a/doc/clam.txt	Thu Apr 12 17:14:50 2012 -0400
+++ b/doc/clam.txt	Thu Apr 12 17:20:03 2012 -0400
@@ -119,6 +119,9 @@
 
     let g:clam_autoreturn = 'topleft'
 
+See the following topics for more information: |:vertical|, |:aboveleft|,
+|:belowright|, |:topleft|, and |:botright|.
+
 Default: 'vertical botright' (split vertical, open at far right)
 
 ==============================================================================
@@ -147,6 +150,7 @@
 v1.2.0
     * Added support for ranges in the :Clam command.
     * Added the :ClamVisual command.
+    * Added the g:clam_winpos option.
 v1.1.0
     * Added the g:clam_autoreturn setting.
 v1.0.0