?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
snapshot (tar.gz zip)
Project renamed from merge3 to mx3r
treefa0d95d3a92d23953918e722b6d6cd06136dfb51
-rwxr-xr-x 292 mdiff blob | blame | history | raw
-rw-r--r-- 9291 mx3r.c blob | blame | history | raw
-rwxr-xr-x 83 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