The gitmergeonefile config section is deprecated

[stgit] / examples / stgitrc

diff --git a/examples/stgitrc b/examples/stgitrc
index a225090..d9bd6ca 100644 (file)
--- a/examples/stgitrc
+++ b/examples/stgitrc
@@ -17,12 +17,13 @@ smtpserver: localhost:25
 #smtpuser: username
 #smtppassword: password
 
+# 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"