I remember way back there was a discussion about using THg with TortoiseMerge
and 3 way diffs. I've always assumed TM didn't do them, but according to Stefan
(the author) it does:
http://stackoverflow.com/questions/460198/best-free-3-way-merge-tool-for-windows
http://tortoisesvn.net/docs/release/TortoiseMerge_en/help-onepage.html#tmerge-dug-dia-3pane
It's just that unlike kdiff3 it doesn't explicitly show the base file.
If I'm understanding right, can TortoiseMerge be used for confict resolution
and 3-way diffing on a merged commit?
Sorry if this has already been discussed.
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
