I suggest you ...

Allow manual alignment of lines in difference utility

When there are many changes in a file, the difference utility sometimes does not find the best matching lines between the two versions, and then the rest of file is misaligned. User should be able to manually align the two -- normal comparison continues to the rest of the file, or to the next manual alignment point if set. BeyondCompare has a similar feature.

55 votes
Vote
Sign in
Check!
(thinking…)
Reset
or sign in with
  • facebook
  • google
    Password icon
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    Robin Carduner shared this idea  ·   ·  Flag idea as inappropriate…  ·  Admin →

    5 comments

    Sign in
    Check!
    (thinking…)
    Reset
    or sign in with
    • facebook
    • google
      Password icon
      Signed in as (Sign out)
      Submitting...
      • Tormod commented  ·   ·  Flag as inappropriate

        Yes, it should be possible to mark line 100 in "server" version and line 150 in "local" version and tell the diff utility that these are actually the same line. The diff utility rarely gets new large blocks of nested code right because it matches the curly braces it encounters on the way..
        So instead of identifying the block encompassing lines 100 to 150 as new lines of code, it shows a bunch of non-existing "changes" instead.

      Feedback and Knowledge Base