Version 0.2.0 - Now capable of some merges. Added example of merge.
commitae9735e1ef6e51460c8427729737441c0d270341
authorDavid Martínez Martí <deavidsedice@gmail.com>
Sun, 20 Apr 2008 17:58:32 +0000 (20 19:58 +0200)
committerDavid Martínez Martí <deavidsedice@gmail.com>
Sun, 20 Apr 2008 17:58:32 +0000 (20 19:58 +0200)
treef090335fda66e23b1ea493b499ae784235656e21
parente825d9299cea4af4307282639ee9b0d6441b30b2
Version 0.2.0 - Now capable of some merges. Added example of merge.
cmdline.c
cmdline.cli
mx3r.1
mx3r.c
testfile1.qs.MERGED_kdiff3 [new file with mode: 0644]