Menu
▾
▴
Re: [Kdiff3-user] What's the differense between 'Go to Next Delta' and 'Go to Next Conflict' ?
|
From: Joachim E. <Joa...@gm...> - 2014-01-16 13:06:29
|
<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div> <div>Hi,</div> <div> </div> <div>When comparing or merging 3 files (of which the first is the common ancestor) a conflict means that in that line both other files have changed.</div> <div>When comparing only two files then there is no difference.</div> <div> </div> <div>Joachim</div> <div> <div name="quote" style="margin:10px 5px 5px 10px; padding: 10px 0 10px 10px; border-left:2px solid #C3D9E5; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"> <div style="margin:0 0 10px 0;"><b>Gesendet:</b> Donnerstag, 16. Januar 2014 um 12:30 Uhr<br/> <b>Von:</b> "Kirill Golub" <fet...@gm...><br/> <b>An:</b> kdi...@li...<br/> <b>Betreff:</b> [Kdiff3-user] What's the differense between 'Go to Next Delta' and 'Go to Next Conflict' ?</div> <div name="quoted-content">What's the differense between 'Go to Next Delta' and 'Go to Next<br/> Conflict' ? This controls always works the same, so I wonder what are<br/> the situations when they behave differently ?<br/> <br/> ------------------------------------------------------------------------------<br/> CenturyLink Cloud: The Leader in Enterprise Cloud Services.<br/> Learn Why More Businesses Are Choosing CenturyLink Cloud For<br/> Critical Workloads, Development Environments & Everything In Between.<br/> Get a Quote or Start a Free Trial Today.<br/> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk</a><br/> _______________________________________________<br/> Kdiff3-user mailing list<br/> Kdi...@li...<br/> <a href="https://lists.sourceforge.net/lists/listinfo/kdiff3-user" target="_blank">https://lists.sourceforge.net/lists/listinfo/kdiff3-user</a></div> </div> </div> </div></div></body></html> |
