The gitmergeonefile config section is deprecated

[stgit] / examples / stgitrc

diff --git a/examples/stgitrc b/examples/stgitrc
index f4facef..d9bd6ca 100644 (file)
--- a/examples/stgitrc
+++ b/examples/stgitrc
@@ -21,12 +21,9 @@ smtpserver: localhost:25
 # 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"