WinMerge.exe Version 2.8.0.0 The path is "C:\Program Files\WinMerge\WinMergeU.exe" How to do it ?
On 7월16일, 오전3시31분, Johannes Sixt <[EMAIL PROTECTED]> wrote: > On Dienstag, 15. Juli 2008, chongyc wrote: > > > Hi everybody > > > I am going to merge conflict by using git-mergetool of msysgit(for > > windows) and Winmerge. > > > what shall i do? > > - Find out whether and how you can run WinMerge with arguments. > > - Define which file versions you want to display, and how the merge result is > to be saved (complication: WinMerge has only 2 panes, not 3). > > - Hook WinMerge into git-mergetool. There's plenty of code to copy&paste. > > - Submit a patch. > > -- Hannes
