| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | mergetool-lib: make the three-way diff the default for vim/gvim | Dan McGee | 2010-09-29 |
| * | mergetool-lib: add a three-way diff view for vim/gvim | Dan McGee | 2010-09-15 |
| * | mergetool-lib: combine vimdiff and gvimdiff run blocks | Dan McGee | 2010-09-15 |
| * | mergetool: Remove explicit references to /dev/tty | Charles Bailey | 2010-08-20 |
| * | add shebang line to git-mergetool--lib.sh | Jeff King | 2010-01-29 |
| * | Merge branch 'rs/work-around-grep-opt-insanity' | Junio C Hamano | 2009-11-25 |
| |\ | |||
| | * | mergetool--lib: simplify guess_merge_tool() | René Scharfe | 2009-11-23 |
| * | | mergetool--lib: add p4merge as a pre-configured mergetool option | Scott Chacon | 2009-10-28 |
| |/ | |||
| * | mergetool--lib: add support for araxis merge | David Aguilar | 2009-05-24 |
| * | mergetool--lib: specialize diff options for emerge and ecmerge | David Aguilar | 2009-05-09 |
| * | mergetool--lib: simplify API usage by removing more global variables | David Aguilar | 2009-04-12 |
| * | difftool/mergetool: refactor commands to use git-mergetool--lib | David Aguilar | 2009-04-08 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/git-mergetool--lib.sh