#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"