Age | Commit message (Expand) | Author |
---|---|---|
2008-10-03 | parse-opt: migrate builtin-merge-file. | Pierre Habouzit |
2008-08-31 | merge.conflictstyle: choose between "merge" and "diff3 -m" styles | Junio C Hamano |
2008-08-31 | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less | Junio C Hamano |
2008-08-31 | xdiff-merge: optionally show conflicts in "diff3 -m" style | Junio C Hamano |
2008-03-14 | Merge branch 'maint' | Junio C Hamano |
2008-03-14 | merge-file: handle empty files gracefully | Johannes Schindelin |
2008-02-18 | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM | Johannes Schindelin |
2007-07-15 | Make every builtin-*.c file #include "builtin.h" | Peter Hagervall |
2007-06-05 | git-merge-file: refuse to merge binary files | Johannes Schindelin |
2006-12-22 | move read_mmfile() into xdiff-interface | Johannes Schindelin |
2006-12-06 | merge-file: support -p and -q; fix compile warnings | Johannes Schindelin |
2006-12-06 | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin |