p4tkmerge - merge tool for p4 resolve based on tkdiff Copyright (c) 2002 Anders Johnson . All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. To install: If the version of Perl to be used is installed anywhere other than /usr/local/bin/perl, then edit the PERL variable in Makefile accordingly. % make % make install # optionally, "make install PREFIX=/..." Version Date Notes ------- ---- ----- 0.01 4/21/2002 First Release 0.02 5/2/2002 Improved error handling 0.03 5/20/02 Works with older versions of diff3. Rev parsing fix. 0.04 5/28/02 Uses IO::File to be signal-safe. 0.05 8/29/02 Fixed POD.