?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 58a40d2) | patch
Soporte para bloques de n lineas (n=6)
commitbc1bd35789b03c4de76a6df9736f971d11d73928
authorDavid Martínez Martí <deavid@gwwebserver.gestiweb.no-ip.info>
Thu, 13 Mar 2008 08:05:10 +0000 (13 09:05 +0100)
committerDavid Martínez Martí <deavid@gwwebserver.gestiweb.no-ip.info>
Thu, 13 Mar 2008 08:05:10 +0000 (13 09:05 +0100)
tree3bead5fb4642a8b097cbd9e306c1da2b72c1f063tree | snapshot (tar.gz zip)
parent58a40d240d237ec375ef60107475513dde52f75bcommit | diff
Soporte para bloques de n lineas (n=6)
merge3.c diff | blob | blame | history
mx3r is a program which merges different versions of the same file in a single one, it is particularily useful when the standard merging process fails