X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/47e93ba96f6ca55cb4bf3701d4d5d190f25c0c49..2c02c3b72d10e45f331e1276caccfa1b3d7c58d5:/examples/stgitrc

diff --git a/examples/stgitrc b/examples/stgitrc
index a225090..fdb11b1 100644
--- a/examples/stgitrc
+++ b/examples/stgitrc
@@ -17,12 +17,16 @@ smtpserver: localhost:25
 #smtpuser: username
 #smtppassword: password
 
+# delay between messages in seconds (defaults to 2)
+#smtpdelay: 2
+
+# stg will look for this first, then look for the EDITOR environmental
+# variable, then default to using 'vi'
+#editor: /usr/bin/vi
 
-[gitmergeonefile]
 # Different three-way merge tools below. Uncomment the preferred one.
 # Note that the 'output' file contains the same data as 'branch1'. This
 # is useful for tools that do not take an output parameter
-
 merger: diff3 -L local -L older -L remote -m -E \
 	"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"