?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Optimizado, ya realiza la primera comparativa con un resultado bueno.
[mx3r.git] / run
blob2d0815d178b5b4af0a2a97f3f4411c16616e535f
1 #!/bin/sh
2 TESTFILE=$1
3
4 gcc merge3.c -lstdc++ -lgcrypt -lgpg-error -o merge3 && ./merge3
5
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