Add the '--interactive' option to 'resolved'

[stgit] / examples / stgitrc

diff --git a/examples/stgitrc b/examples/stgitrc
index fdb11b1..cd22e97 100644 (file)
--- a/examples/stgitrc
+++ b/examples/stgitrc
@@ -24,18 +24,26 @@ smtpserver: localhost:25
 # variable, then default to using 'vi'
 #editor: /usr/bin/vi
 
-# 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 \
+# this value overrides the default PAGER environment variable
+#pager: less -S
+
+# The three-way merge tool. 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 current -L ancestor -L patched -m -E \
        "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
 
-#merger: xxdiff --title1 local --title2 older --title3 remote \
+# Interactive three-way merge tool. It is executed by the 'resolved
+# --interactive' command
+#imerger: xxdiff --title1 current --title2 ancestor --title3 patched \
 #      --show-merged-pane -m -E -O -X -M "%(output)s" \
 #      "%(branch1)s" "%(ancestor)s" "%(branch2)s"
-
-#merger: emacs --eval '(ediff-merge-files-with-ancestor
+#imerger: emacs --eval '(ediff-merge-files-with-ancestor
 #      "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
 
 # Leave the original files in the working tree in case of a merge conflict
 keeporig: yes
+
+# Extensions for the files involved in a three-way merge (ancestor,
+# current, patched)
+#extensions: .ancestor .current .patched