Re: TortoiseMerge: Merge result not good enough

On 09.12.2013 15:46, ch3cooli wrote:
> TortoiseMerge: Merge result not good enough
>
> TortoiseMerge.exe
> /base:"D:\shoppinglist\shoppinglist.txt.BASE.txt"
> /theirs:"D:\shoppinglist\shoppinglist.txt.REMOTE.txt"
> /mine:"D:\shoppinglist\shoppinglist.txt.LOCAL.txt"
> /merged:"D:\shoppinglist\shoppinglist.txt"
> /basename:"BASE"
> /theirsname:"REMOTE"
> /minename:"LOCAL"
> /mergedname:"shoppinglist.txt"
>
> Any room for improvement? (See merge_p4merge.png as reference)

I don't see what's not good enough?
TMerge shows one conflict while p4merge shows two, but I don't think
showing two conflicts is better than one. p4merge just uses a smaller
block size to detect the conflicts.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3070022
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].