qosaadvisors.blogg.se

This feature enables a version control system to provide meaningful titles for comparison panels. Set an informative title for the comparison panel that displays the Nth file/folder specified on the command-line. Swap the files/folders displayed in the left and right panels. The common ancestor is shown in the middle comparison panel. The Nth file/folder argument specifies a common ancestor of the other two files or folders. Wait for user to close the comparison in Merge before exiting.ĭo not wait for the user to close the comparison in Merge before exiting. Usage įileArguments for a file comparison are: įolderArguments for a folder comparison are: The Windows Terminal always waits for the ConsoleCompare.exe command to exit before returning control. As this behaviour is sometimes undesired, Merge is supplied with a console version of Compare.exe, called ConsoleCompare.exe. Consequently, even if you use the /wait command-line argument (see Usage, below) to Compare.exe in a Windows Terminal, control is returned to the prompt as soon as the command is launched, even though Compare.exe is still running and waiting for Merge to be closed.

Neither the Windows Terminal nor the Windows Command Prompt wait for graphical Windows applications such as Compare.exe to complete before returning control to the user. ConsoleCompare.exe is a console application and is generally used to launch Merge from console-based command-line tools. The difference between Compare and ConsoleCompareĬompare.exe is a graphical Windows application and is typically used to launch Merge from other graphical Windows applications. These programs use the Merge Automation API to launch file and folder comparisons within a new or existing instance of Merge. The recommended way to use Merge from the command-line is to use one of the Compare.exe or ConsoleCompare.exe command-line utilities. Compare and ConsoleCompare command-line utilities The Automation API enables even greater control over Merge. See Integrating with Source Control, Configuration Management and Other Applications for application-specific instructions. Merge provides several command-line tools that enable you to launch Merge from a variety of applications.