Changes between Version 4 and Version 5 of Programming/Python/MercurialDiffsWithVimOnWindows


Ignore:
Timestamp:
Jan 17, 2017, 8:27:32 AM (4 years ago)
Author:
Vijay Varadan
Comment:

Fixed incorrect anchor definition and updated anchor name

Legend:

Unmodified
Added
Removed
Modified
  • Programming/Python/MercurialDiffsWithVimOnWindows

    v4 v5  
    44[[Image(htdocs:images/mercurial/using-vim-with-mercurial-for-diffs.png, alt="vim + mercurial", align=center)]]
    55
    6 **[#UPDATE-2017-Jan-17 UPDATED 2017-Jan-17] for newer versions of !DirDiff.**
     6**[#Update_20170117 UPDATED 2017-Jan-17] for newer versions of !DirDiff.**
    77
    88I had the devil of a time getting vimdiff and mercurial to play nicely with with each other on Windows for visual diffs. It worked great on posix systems using instructions from the mercurial wiki both to diff single files as well as a multiple files. But on Windows, it would only work for single files, giving me rather strange errors when trying to diff multiple files.
     
    4848}}}
    4949
    50 **[#UPDATE-2017-Jan-17 UPDATE 2017-Jan-17]**: If you still run into an issue after the above fix and get an error message "There is no diff at the current line!", you are most likely using a newer version of !DirDiff which forces UNIX-style locale specification at the command line without checking if it's running on Windows. The fix is to add the following line to your _vimrc or .vimrc file:
     50**[=#Update_20170117 UPDATE 2017-Jan-17]**: If you still run into an issue after the above fix and get an error message "There is no diff at the current line!", you are most likely using a newer version of !DirDiff which forces UNIX-style locale specification at the command line without checking if it's running on Windows. The fix is to add the following line to your _vimrc or .vimrc file:
    5151{{{
    5252let g:DirDiffForceLang=""