From e0bbefddad17255e8905d7a6b7aaaed910168c4c Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Tue, 6 Feb 2007 22:45:18 +0000 Subject: [PATCH] Escape the quotes in example/gitconfig With the new git-repo-config, the quotes are ignored unless escaped, breaking some functionality (emacs interactive merger). Signed-off-by: Catalin Marinas --- examples/gitconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/gitconfig b/examples/gitconfig index 60f6e85..4e775fc 100644 --- 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 \ - # "%(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 \ - # --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 \ - # "%(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 -- 2.11.0