-# 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"
+# this value overrides the default PAGER environment variable
+#pager: ~/share/stgit/contrib/diffcol.sh
+
+# GIT pull command (should take the same arguments as git-pull)
+#pullcmd: git-pull
+
+# 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"