Public Git Hosting - mx3r.git/tree

tree	321d9b0d9cac2de3dd8e0914f846d650f3d4f8c7

-rwxr-xr-x	296	mdiff	blob \| blame \| history \| raw
-rw-r--r--	8643	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

RSS Atom