?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
snapshot (tar.gz zip)
Mejoras varias al código.
tree33eed3d63005852afa5e74b90197375f6450b1a4
-rwxr-xr-x 296 mdiff blob | blame | history | raw
-rw-r--r-- 9474 merge3.c blob | blame | history | raw
-rwxr-xr-x 90 run blob | blame | history | raw
-rw-r--r-- 114824 testfile1.qs.BASE blob | blame | history | raw
-rw-r--r-- 123208 testfile1.qs.LOCAL blob | blame | history | raw
-rw-r--r-- 117497 testfile1.qs.REMOTE blob | blame | history | raw
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