ZigVersion 1.2 beta3 - 2007/06/27 22:20ZigVersion 1.2 beta3 is ready! This version fixes a lot of issues in the revision viewer, and introduces a merge command for files that had a conflict - it will launch FileMerge if installed (part of xcode). Scripts are now in the dmg, read the document in the scripts directory for more information.
Re:ZigVersion 1.2 beta3 - 2007/07/27 12:06Is there some key sequence in RevisionViewer, like is found in FileMerge, to skip from one diff to the next/prev?
I love the new Merge functionality. However when I run an update that should fire the FileMerge.app it doesn't. The correct files are written out and I can open FileMerge.app manually and correct any conflicts, it just doesn't happen automatically. Is there a setting somewhere where I need to set the path of FileMerge.app?
Re:ZigVersion 1.2 beta3 - 2007/09/27 07:19Just tested this out in beta 4 and FileMerge still doesn't open automatically. Is there a path I'm missing somewhere?