Escape the quotes in example/gitconfig

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 60f6e8599c4897dfdbb6efb6c969a05ce751015c..4e775fc5d452dbc96aa7be320dd6fafc13eb1b17 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -46,15 +46,17 @@
        # 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 \
        # 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"
+       #       \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\" \
+       #       > \"%(output)s\"

 
        # Interactive three-way merge tool. It is executed by the 'resolved
        # --interactive' command
        #imerger = xxdiff --title1 current --title2 ancestor --title3 patched \
 
        # 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"
+       #       --show-merged-pane -m -E -O -X -M \"%(output)s\" \
+       #       \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\"

        #imerger = emacs --eval '(ediff-merge-files-with-ancestor \
        #imerger = emacs --eval '(ediff-merge-files-with-ancestor \

-       #       "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
+       #       \"%(branch1)s\" \"%(branch2)s\" \"%(ancestor)s\" nil \
+       #       \"%(output)s\")'

 
        # Automatically invoke the interactive merger in case of conflicts
        #autoimerge = no
 
        # Automatically invoke the interactive merger in case of conflicts
        #autoimerge = no