Age | Commit message (Expand) | Author |
---|---|---|
2009-11-25 | Merge branch 'rs/work-around-grep-opt-insanity' | Junio C Hamano |
2009-11-24 | mergetool--lib: simplify guess_merge_tool() | René Scharfe |
2009-10-29 | mergetool--lib: add p4merge as a pre-configured mergetool option | Scott Chacon |
2009-05-24 | mergetool--lib: add support for araxis merge | David Aguilar |
2009-05-09 | mergetool--lib: specialize diff options for emerge and ecmerge | David Aguilar |
2009-04-13 | mergetool--lib: simplify API usage by removing more global variables | David Aguilar |
2009-04-08 | difftool/mergetool: refactor commands to use git-mergetool--lib | David Aguilar |