p4tkmerge - merge tool for p4 resolve based on tkdiff Copyright (c) 2002 Anders Johnson <[email protected]>. 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.
| # | Change | User | Description | Committed | |
|---|---|---|---|---|---|
| #4 | 2071 | anders_johnson | Release p4tkmerge-0.05 | ||
| #3 | 1865 | anders_johnson | Version 0.04 | ||
| #2 | 1839 | anders_johnson |
p4tkmerge 0.03. Works with older versions of diff3. Fixed a rev parsing bug. |
||
| #1 | 1780 | anders_johnson | p4checkpoint-0.03, p4tkd-0.01, p4tkmerge-0.02 |