|
From: Jeanson, M. <Mar...@na...> - 2005-10-21 20:44:35
|
HI, =20 I'm currently using Kdiff3 (it's fantastic) to do a 3 way merge via another application that batches up the merges. I call kdiff3 like this: Kdiff3 test1.cpp test2.cpp test3.cpp -o output.cpp -auto =20 Reading the help, it says that -auto should display No GUI if all conflicts are auto-solvable. (Needs -o file). When I use this option it does automatically merge the file, but it flashes the Kdiff3 UI briefly while it does the merge. Now this isn't bad if I'm only merging once, but because I'm batching up several merges in a row I'd like the merge to occur silently. Is there anyway to do this? I'm guessing no, but I figured I'd try anyway. =20 I'm using version 0.9.86 on windows.=20 =20 Thanks in advance. |