Dear magit developers, can magit also use ediff/emerge to merge encrypted files? I tried and got a lisp error "Errors in diff output" (see below). To me it looks like diff3 gets fed the encrypted file.
A small git repository to reproduce the behavior is here: http://speedy.sh/DRGCQ/magitmergegpgtest.tgz (the passphrase for all versions is "secret"). To reproduce: - open test.gpg - enter "secret" as passphrase - M-x magit-status - e Any help appreciated ! Thanks for the great git/emacs integration! & best Lars --- error message Debugger entered--Lisp error: (error "Errors in diff output. Diff output is in #<buffer *ediff-diff*>") signal(error ("Errors in diff output. Diff output is in #<buffer *ediff-diff*>")) error("Errors in diff output. Diff output is in %S" #<buffer *ediff-diff*>) ediff-prepare-error-list("^\\([1-3]:\\|====\\| \\|.*Warning *:\\|.*No newline\\|.*missing newline\\|^ $\\)" #<buffer *ediff-diff*>) ediff-setup-diff-regions3("/tmp/ediff13043BzW" "/tmp/ediff13043O9c" "/tmp/ediff13043bHj") ediff-setup(#<buffer test.gpg.current> "/tmp/ediff13043BzW" #<buffer test.gpg.merged> "/tmp/ediff13043O9c" #<buffer test.gpg.base> "/tmp/ediff13043bHj" ((lambda nil (delete-file "/tmp/ediff13043BzW") (delete-file "/tmp/ediff13043O9c") (if (stringp "/tmp/ediff13043bHj") (delete-file "/tmp/ediff13043bHj"))) ediff-merge-on-startup) ((ediff-job-name . ediff-merge-buffers-with-ancestor)) "test.gpg") ediff-buffers-internal(#<buffer test.gpg.current> #<buffer test.gpg.merged> #<buffer test.gpg.base> (ediff-merge-on-startup) ediff-merge-buffers-with-ancestor "test.gpg") ediff-merge-buffers-with-ancestor(#<buffer test.gpg.current> #<buffer test.gpg.merged> #<buffer test.gpg.base> nil nil "test.gpg") magit-interactive-resolve("test.gpg") magit-ediff() call-interactively(magit-ediff nil nil) --- ediff-errors /usr/bin/diff3: subsidiary program `diff' failed (exit status 2) -- You received this message because you are subscribed to the Google Groups "magit" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
