#Tortoisehg change diff tool software#
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
To properly configure it, we need replace the extdiff and tortoisehg sections as these: extdiff cmd.semanticdiff C:\Users\Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: We have reviewed the guide available to configure semanticMerge with Mercurial and we found a mistake in the 'mercurial.ini' file. Select "Extract diff with this row as header".Right click to display the context menu.If the currently displayed header is not what you expect, you may resolve it by specifying the appropriate header and extract diff. If there are column deletions or additions, they may not be displayed at the expected position.The format can be changed from "differential extraction setting". Register the external command specified by the command line argument -external-cmd.Ĭan also be executed from within the tool.įor each file you can specify a line header or a column header.īy selecting Ctrl + D or "Output log" from the context menu, you can output the change as a log.
Excelmerge.executable = C:\Program Files (x86)\ExcelMerge\Įxcelmerge.diffargs = diff -s $parent1 -d $child -c WinMerge -i -w -v -e empty -k
0 kommentar(er)
