Loading ...
Sorry, an error occurred while loading the content.

136265Re: Using vimdiff for merging with Unison File Synchronizer

Expand Messages
  • Ben Fritz
    Feb 19, 2013
    • 0 Attachment
      On Tuesday, February 19, 2013 7:08:21 AM UTC-6, erwin.g...@... wrote:
      > Hi
      >
      > The File Synchronizer Unison has the possibility to merge two versions of a file both of which have been changed. Unison is perfect for use in a shell, so using it with vim as the merging tool would be perfect, too. The problem is that using a simple
      > "vimdiff CURRENT1 CURRENT2"
      > just does not start vim. The two best links regarding this are the following:
      >
      > http://trembits.blogspot.co.at/2010/02/merging-unison-conflict-with-vim.html
      > http://hash-bang.net/2009/08/ia-merging-unison/
      >
      > Their solutions are workarounds, one starts a screen-Session, the other uses gvimdiff. But it would be better to have it working directly in the terminal session.
      > So my question is, does anybody know what kind of problem this is?
      > I've tried some options like -debug or -V, but there is no possibility to get more information out of it.

      Maybe vimdiff is an alias which is not being used, or a script not on the path, or something like that?

      Try vim -d CURRENT1 CURRENT2 to launch Vim in diff mode a different way.

      --
      --
      You received this message from the "vim_use" maillist.
      Do not top-post! Type your reply below the text you are replying to.
      For more information, visit http://www.vim.org/maillist.php

      ---
      You received this message because you are subscribed to the Google Groups "vim_use" group.
      To unsubscribe from this group and stop receiving emails from it, send an email to vim_use+unsubscribe@....
      For more options, visit https://groups.google.com/groups/opt_out.
    • Show all 4 messages in this topic