archive-com.com » COM » S » SOURCEGEAR.COM

Total: 253

Choose link from "Titles, links and description words view":

Or switch to "Titles and links view".
  • TortoiseSVN - - SourceGear DiffMerge
    changes theirs will be in the right panel When you save your merge changes they will be written to the merge result merged file Prev Up Next Home Contents Search Contact Information Introduction Installation Windows Macintosh Ubuntu and Mint Linux Fedora Linux Registration File Diff Merge Windows File Window Types File Diff Windows File Merge Windows Opening File Windows Parts of a File Window File Panels The Glance Bar The View Selector Ruleset Indicator Character Encoding Indicator The Splitter The Toolbar Showing Changes Detail Level Lines Only Lines and Characters Highlighting Changes Aggregating Changes Manual Alignment Markers The Line Display Mode Omitted Lines Hiding Unimportant Differences Change Ruleset Exporting File Differences File Editing Interactive Editing Patching Merge to Center Panel Auto Merge Undo Redo Moving Around within Files The Folder Diff Window Opening Folder Diff Windows Parts of a Folder Diff Window Folder Listing The Toolbar Other Menu Commands Context Menus Export Commands The Options Dialog The File Windows Page Fonts Window Options The Rulesets Page Default Ruleset Custom Rulesets The Detail Level Page Analysis Detail Level Multi Line Intra Line Analysis Detail Level Intra line Smoothing Threshold Inter line Smoothing Threshold The Line Colors Page The Intra Line Colors Page The Other Colors Page The Folder Windows Page Fonts Window Options The Folder Filters Page Filename Filters Sub folder Filters Ignore Case The Folder Colors Page The Equivalence Mode Page The Messages Page The Explorer Integration Page Personal Settings Using Explorer Integration The External Tools Page Rulesets Overview The Ruleset Dialog The Name Page Ruleset Name File Suffixes The Character Encodings Page Automatic Detection Fallback Options Named Encoding The Lines to Omit Page The Pattern Dialog Pattern Lines to Skip The Line Handling Page Line Termination Line Matching The Content Handling Page Matched Contexts Default Context Guidelines The Context

    Original URL path: http://www.sourcegear.com/diffmerge/webhelp/sec__tortoise__svn.html (2016-05-01)
    Open archived version from archive


  • Microsoft TFS - - SourceGear DiffMerge
    command line your changes 2 will be in the left panel the common ancestor 3 will be in the center panel and their changes 1 will be in the right panel When you save your merge changes they will be written to the merge result 4 file Prev Up Next Home Contents Search Contact Information Introduction Installation Windows Macintosh Ubuntu and Mint Linux Fedora Linux Registration File Diff Merge Windows File Window Types File Diff Windows File Merge Windows Opening File Windows Parts of a File Window File Panels The Glance Bar The View Selector Ruleset Indicator Character Encoding Indicator The Splitter The Toolbar Showing Changes Detail Level Lines Only Lines and Characters Highlighting Changes Aggregating Changes Manual Alignment Markers The Line Display Mode Omitted Lines Hiding Unimportant Differences Change Ruleset Exporting File Differences File Editing Interactive Editing Patching Merge to Center Panel Auto Merge Undo Redo Moving Around within Files The Folder Diff Window Opening Folder Diff Windows Parts of a Folder Diff Window Folder Listing The Toolbar Other Menu Commands Context Menus Export Commands The Options Dialog The File Windows Page Fonts Window Options The Rulesets Page Default Ruleset Custom Rulesets The Detail Level Page Analysis Detail Level Multi Line Intra Line Analysis Detail Level Intra line Smoothing Threshold Inter line Smoothing Threshold The Line Colors Page The Intra Line Colors Page The Other Colors Page The Folder Windows Page Fonts Window Options The Folder Filters Page Filename Filters Sub folder Filters Ignore Case The Folder Colors Page The Equivalence Mode Page The Messages Page The Explorer Integration Page Personal Settings Using Explorer Integration The External Tools Page Rulesets Overview The Ruleset Dialog The Name Page Ruleset Name File Suffixes The Character Encodings Page Automatic Detection Fallback Options Named Encoding The Lines to Omit Page The Pattern Dialog

    Original URL path: http://www.sourcegear.com/diffmerge/webhelp/sec__microsoft__tfs.html (2016-05-01)
    Open archived version from archive

  • Microsoft VSS 2005 - - SourceGear DiffMerge
    File Diff Merge Windows File Window Types File Diff Windows File Merge Windows Opening File Windows Parts of a File Window File Panels The Glance Bar The View Selector Ruleset Indicator Character Encoding Indicator The Splitter The Toolbar Showing Changes Detail Level Lines Only Lines and Characters Highlighting Changes Aggregating Changes Manual Alignment Markers The Line Display Mode Omitted Lines Hiding Unimportant Differences Change Ruleset Exporting File Differences File Editing Interactive Editing Patching Merge to Center Panel Auto Merge Undo Redo Moving Around within Files The Folder Diff Window Opening Folder Diff Windows Parts of a Folder Diff Window Folder Listing The Toolbar Other Menu Commands Context Menus Export Commands The Options Dialog The File Windows Page Fonts Window Options The Rulesets Page Default Ruleset Custom Rulesets The Detail Level Page Analysis Detail Level Multi Line Intra Line Analysis Detail Level Intra line Smoothing Threshold Inter line Smoothing Threshold The Line Colors Page The Intra Line Colors Page The Other Colors Page The Folder Windows Page Fonts Window Options The Folder Filters Page Filename Filters Sub folder Filters Ignore Case The Folder Colors Page The Equivalence Mode Page The Messages Page The Explorer Integration Page Personal Settings Using Explorer Integration The External Tools Page Rulesets Overview The Ruleset Dialog The Name Page Ruleset Name File Suffixes The Character Encodings Page Automatic Detection Fallback Options Named Encoding The Lines to Omit Page The Pattern Dialog Pattern Lines to Skip The Line Handling Page Line Termination Line Matching The Content Handling Page Matched Contexts Default Context Guidelines The Context Dialog Equivalence Mode External Tools Overview Launching an External Tool The External Tools Dialog The Name Page The Diff Page The Merge Page Printing Printing File Windows Printing Folder Windows Command Line Arguments Opening an Empty Window Opening a Diff Window Opening a

    Original URL path: http://www.sourcegear.com/diffmerge/webhelp/sec__microsoft__vss.html (2016-05-01)
    Open archived version from archive

  • Release 4.2.0 - October 2013 - - SourceGear DiffMerge
    to wxWidgets 3 0 0 rc1 from 2 9 5 Changes in 4 2 0 for Linux No Linux specific changes Changes in 4 2 0 for Windows Added Drag and Drop onto text fields within Open Dialog The change in 4 0 to make those fields auto complete on Windows broke Drop support Fixed Paste in file windows to respect the line endings EOLs of the destination file Fixed occasional hang seen on Windows when closing last window and error messages seen when repeatedly clicking on close button while in the hung state Changes in 4 2 0 for OS X Finder integration DiffMerge should now appear in Finder s Open with context menu and the Finder Services menu when an appropriate file or folder is selected You should also be able to drop items onto the DiffMerge icon in the Dock Only the first 2 selected or dropped items are recognized and the Open Dialog will be raised first to let you verify the order of the items You may have to log out and back in before these appear Fixed the Edit Find Edit Find Next Edit Find Previous and Edit Use Selection for Find commands to use the system wide search text This is a follow on to S3363 and allow Command E and Command G to work between apps using the NSFindPboard facility Fixed problems with keyboard input and interactive editing in a file diff or merge window when entering composed characters The typical use for this is to enter accented characters in European languages using various dead char sequences Set wxWINDOW VARIANT SMALL propery on windows and dialogs so that controls and fonts look more natural Fixed initial position of Print Preview Windows Sometimes they would initially appear with the title bar offscreen which made them difficult to move or close This was observed on multiple monitor systems Updated code to populate menu bar so that Folder Windows only have folder related items and File Windows only have file related items When the original OS X menu bar code was written there was a problem with changing menu bars once populated such as when going from an empty window to one with either a file or folder pair so the menu was created with all menu items and half of them grayed This has been fixed and now the menu content behaves like it does on the other platforms Prev Up Next Home Contents Search Contact Information Introduction Installation Windows Macintosh Ubuntu and Mint Linux Fedora Linux Registration File Diff Merge Windows File Window Types File Diff Windows File Merge Windows Opening File Windows Parts of a File Window File Panels The Glance Bar The View Selector Ruleset Indicator Character Encoding Indicator The Splitter The Toolbar Showing Changes Detail Level Lines Only Lines and Characters Highlighting Changes Aggregating Changes Manual Alignment Markers The Line Display Mode Omitted Lines Hiding Unimportant Differences Change Ruleset Exporting File Differences File Editing Interactive Editing Patching Merge to Center

    Original URL path: http://www.sourcegear.com/diffmerge/webhelp/sec__release__4_2_0.html (2016-05-01)
    Open archived version from archive

  • Release 4.1.0 - August 2013 - - SourceGear DiffMerge
    value W0886 W6312 New icons for line items within the Folder Window P7454 Fixed handling of ESCape key Prior to 4 0 the ESCape key could be used to close a file or folder window This stopped working in 4 0 Changes in 4 1 0 for Linux W9818 The 4 0 release with wxWidgets 2 9 4 would occasionally print a GLib CRITICAL message on the console when the PRINT button was pressed on the Print Preview window This has been fixed in the 2 9 5 release of wxWidgets W8669 Fixed certain accelerator key keybindings in File Windows Changes in 4 1 0 for Windows W2593 Improved support for Windows shortcuts lnk files in folder windows The folder window will now compare the contents of a pair of shortcuts for equality This is a binary raw comparison to see if the links have identical content target working directory arguments etc it does not attempt to dereference the targets W3459 Updated folder window printing for the above shortcuts changes W3747 W5281 W7281 W9346 W4964 W2917 Added Shortcut Details dialog Folder windows now allow right click or double click on Windows shortcut lnk rows and have a View Shortcut Details menu command These will raise a dialog showing the contents of the shortcuts target working directory arguments icon etc For shortcut pairs that have file or folder targets this dialog contains a button to open a file or folder window to compare them This button isn t present when the target refers to a printer for example W9103 Allow Windows shortcut lnk files on the command line and automatically dereference them and open a file or folder window on their targets Changes in 4 1 0 for OS X W7716 Fixed crash when using PageUp PageDown keys when caret was offscreen W0394 Fixed Control Mouse bindings in file windows which allow you to select a single line within a multi line change There were changes in wxWidgets from 2 8 to 2 9 affecting how modifier keys are handled that were not properly addressed in the 4 0 release W0394 W2624 Fixed Updated navigation key bindings Left Right Up Down PageUp PageDown Home End to account for changes in how modifier keys are handled in wxWidgets 2 9 Prior to 4 0 we used Ctrl and Ctrl Option in some bindings These were inadvertently changed to Command and Command Option in 4 0 with the wxWidgets functionality changes But there were a few bindings that didn t work For the 4 1 release I ve explicitly fixed all the bindings to use Command and Command Option keys and updated the various tooltips W5099 Fixed problem with Cut Copy Paste that would happen when a modeless dialog such as Find or GoTo Line was open W0058 Fixed problem with Command keys inserting the key into the window when that command was disabled in the menu W9586 Fixed problem with keyboard input and interactive editing in a file window when using a

    Original URL path: http://www.sourcegear.com/diffmerge/webhelp/sec__release__4_1_0.html (2016-05-01)
    Open archived version from archive

  • Release 4.0.0 - June 2013 - - SourceGear DiffMerge
    on startup and deprecated the nosplash command line argument Changes in 4 0 0 for Linux W2655 Force cursor and scroll position to top of Support Dialog when opened G9660 Fix default wildcard pattern from to that was passed to the stock File Open dialog This was preventing the selection of files without suffixes Added section on using our APT repository on Ubuntu and Mint to the manual Changes in 4 0 0 for Windows W7021 Added auto complete to the File Open dialogs W6778 Better support of Windows Shortcuts lnk files in Folder Windows Previous versions would incorrectly try to expand the shortcut target and use the target string in the Folder Window row This caused problems when the target was an unavailable network share or a printer This release does not attempt to dereference shortcuts not even to see if a pair points to the same thing It just lists them as links with the lnk suffix which Windows Explorer hides A future release will address comparing link targets and or matchup with a possible peer without the lnk suffix W5971 W6608 Disallow Windows Shortcuts lnk files on the command line and in the File Open dialogs Again this release does not attempt to dereference shortcuts The changes here are to prevent DiffMerge from trying to open the lnk file as a plain file and then complaining when the UNICODE import fails A future release will address dereferencing link targets W7816 Added sgdm cygwin sh to the distribution This is a cygwin bash shell script wrapper to translate cygwin style pathnames to dos style pathnames and then invoke DiffMerge See the section on Git Under Cygwin and Mercurial Under Cygwin for more information Added section to manual for Mercurial under Cygwin Added section to manual for VSS Changes in 4 0 0 for OS X The upgrade to wxWidgets version 2 9 4 allowed us to convert from Carbon to Cocoa system libraries This gives DiffMerge a more modern look and feel such as being able to resize a window from any edge rather than just the bottom right corner The upgrade to the Cocoa system libraries allowed us to offer both 32 and 64 bit Intel versions Previous releases were limited to 32 bits because of our dependency on Carbon This version of DiffMerge is built as a Universal binary so both Intel versions are contained within the same application executable W2119 Added support for Retina Display W7615 Fixed ugly ugly ugly hack to try to raise the initial window when launched from the Terminal using the DiffMerge executable directly rather than the DiffMerge app application bundle Prev Up Next Home Contents Search Contact Information Introduction Installation Windows Macintosh Ubuntu and Mint Linux Fedora Linux Registration File Diff Merge Windows File Window Types File Diff Windows File Merge Windows Opening File Windows Parts of a File Window File Panels The Glance Bar The View Selector Ruleset Indicator Character Encoding Indicator The Splitter The Toolbar Showing Changes Detail

    Original URL path: http://www.sourcegear.com/diffmerge/webhelp/sec__release__4_0_0.html (2016-05-01)
    Open archived version from archive

  • Release 3.3.2 - December 2011 - - SourceGear DiffMerge
    may get the following warning message Gtk WARNING Unable to locate theme engine in module path pixmap This refers to a missing system library and appears to be harmless See https bugs launchpad net ubuntu source quickly bug 853232 for details Installing the following package quiets the message sudo apt get install gtk2 engines pixbuf Changes in 3 3 2 for Windows J4544 Some of the CLC and HG examples in the manual still referred to DiffMerge exe rather than sgdm exe J5173 Fixed shell extension to not call DestroyMenu on the parts of the context menu for better compatibility with 3rd party shell replacements Changes in 3 3 2 for OS X X2475 Fix typo in the README file distributed with the DMG regarding the name of the man page J9340 Updated Makefile to force 10 6 SnowLeopard compatibility when building on a Lion system with macosx sdk Developer SDKs MacOSX10 6 sdk with macosx version min 10 6 Prev Up Next Home Contents Search Contact Information Introduction Installation Windows Macintosh Ubuntu and Mint Linux Fedora Linux Registration File Diff Merge Windows File Window Types File Diff Windows File Merge Windows Opening File Windows Parts of a File Window File Panels The Glance Bar The View Selector Ruleset Indicator Character Encoding Indicator The Splitter The Toolbar Showing Changes Detail Level Lines Only Lines and Characters Highlighting Changes Aggregating Changes Manual Alignment Markers The Line Display Mode Omitted Lines Hiding Unimportant Differences Change Ruleset Exporting File Differences File Editing Interactive Editing Patching Merge to Center Panel Auto Merge Undo Redo Moving Around within Files The Folder Diff Window Opening Folder Diff Windows Parts of a Folder Diff Window Folder Listing The Toolbar Other Menu Commands Context Menus Export Commands The Options Dialog The File Windows Page Fonts Window Options The

    Original URL path: http://www.sourcegear.com/diffmerge/webhelp/sec__release__3_3_2.html (2016-05-01)
    Open archived version from archive

  • Release 3.3.1 - July 2011 - - SourceGear DiffMerge
    user visible change it does change how the core DiffMerge components are installed on the system so that they can be shared by other SourceGear products These are now installed in Program Files SourceGear Common DiffMerge rather than Program Files SourceGear DiffMerge In the past Vault installed a private copy of the DiffMerge executable in the Vault installation directory Future versions of Vault will be able to use the shared version And by sharing the core DiffMerge components it also means that they will be updated whenever any of the products are updated The stand alone DiffMerge MSI installer was changed to be a thin wrapper around the core common DiffMerge components in the MSM Since the MSI is a publicly visible package with a published version number that version number will appear in the Add Remove Programs Control Panel under the entry for DiffMerge But you may have more recent shared components on the system if another more recent SourceGear product is also installed You can always refer to the DiffMerge About Box to determine if you have newer shared components installed The name of the DiffMerge EXE was changed to sgdm exe In the past the name of EXE was either DiffMerge exe sgdm exe or sgdm3 exe depending upon whether it was distributed in the stand alone package or bundled with another product With the change to a shared component strategy it was changed to sgdm exe This also avoids a collision with a program named diffmerge exe that is distributed as part of Visual Studio The new MSI installer always does a per machine install It always installs the Windows Explorer extension DLL And it adds Program Files SourceGear Common DiffMerge to the system PATH environment variable The various InstallPath keys in the Registry were moved to likewise be common shared See HKLM SOFTWARE SourceGear Common DiffMerge Installer And in particular HKLM SOFTWARE SourceGear Common DiffMerge Installer Location Bug Fix GDI Handle leak in Explorer extension Item 15907 Changes in 3 3 1 for OS X Bug Fix Font Dialog appear and immediate disappear problem on OS X 10 6 Item 15271 This was a problem in wxWidgets and resolved by the upgrade to 2 8 12 Placed a copy of the diffmerge sh shell script inside the APP so that programs such as Veracity can use it even if you don t install the script in usr bin There is NO 64 bit version of DiffMerge for the Mac because wxWidgets does not support 64 bit as of 2 8 12 at least The Mac version now ships in PKG package in addition to DMG format Prev Up Next Home Contents Search Contact Information Introduction Installation Windows Macintosh Ubuntu and Mint Linux Fedora Linux Registration File Diff Merge Windows File Window Types File Diff Windows File Merge Windows Opening File Windows Parts of a File Window File Panels The Glance Bar The View Selector Ruleset Indicator Character Encoding Indicator The Splitter The Toolbar Showing Changes

    Original URL path: http://www.sourcegear.com/diffmerge/webhelp/sec__release__3_3_1.html (2016-05-01)
    Open archived version from archive



  •