auto merge without GUI when no conflicts

Support for our DiffMerge utility.

Moderator: SourceGear

Post Reply
shianmiin
Posts: 1
Joined: Thu Aug 14, 2008 6:46 am

auto merge without GUI when no conflicts

Post by shianmiin » Thu Aug 14, 2008 6:52 am

When doing 3-way merge, is it possible to provide an option not to show GUI if there is no conflicts?
something like -auto option in KDiff3 $1 $2 $3 -o $4 -auto

jeffhostetler
Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
Contact:

Re: auto merge without GUI when no conflicts

Post by jeffhostetler » Thu Aug 14, 2008 8:44 am

Sorry, but no. But it would be nice to be able to do that.
I'll add a feature request for this.

FWIW, there is a command line option to do a diff.

jeff

Post Reply