?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: ae9735e) | patch
Merge Bug corrected.
commitc5579450bb618d505b89fb46fe429e13191f477e
authorDavid Martínez Martí <deavidsedice@gmail.com>
Sun, 20 Apr 2008 18:31:14 +0000 (20 20:31 +0200)
committerDavid Martínez Martí <deavidsedice@gmail.com>
Sun, 20 Apr 2008 18:31:14 +0000 (20 20:31 +0200)
tree44170f97512195f208c45726e171e7e3d5972de3tree | snapshot (tar.gz zip)
parentae9735e1ef6e51460c8427729737441c0d270341commit | diff
Merge Bug corrected.
mx3r.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