From: Ruslan Z. <ru...@be...> - 2008-03-20 15:27:01
|
SVK has integrated support of KDiff3 and I use it during merges to resolve conflicts. And it's really helpful, however it's actually integration from another side. May be it's also a good thing to ask subversion guys as well. On Tue, Jan 29, 2008 at 1:39 AM, Scott Gable <gab...@gm...> wrote: > This is a feature request for kdiff3. > > I wish that it had automatic revision control comprehension for subversion > and other tools. For example with tkdiff if you have edited your local copy > of foo.c you can simply review your changes by typing: > tkdiff foo.c > Obviously if there is a conflict between your changes and an update to the > repository you should be able to do a three way compare with the same > command: > kdiff3 foo.c > > Thanks. > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2008. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ > Kdiff3-user mailing list > Kdi...@li... > https://lists.sourceforge.net/lists/listinfo/kdiff3-user > > -- Best regards, Ruslan. |