| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | mergetool--lib: simplify guess_merge_tool() | René Scharfe | 2009-11-23 | 1 | -7/+6 | |
| * | | mergetool--lib: add p4merge as a pre-configured mergetool option | Scott Chacon | 2009-10-28 | 1 | -2/+15 | |
| |/ | ||||||
| * | mergetool--lib: add support for araxis merge | David Aguilar | 2009-05-24 | 1 | -2/+23 | |
| * | mergetool--lib: specialize diff options for emerge and ecmerge | David Aguilar | 2009-05-09 | 1 | -3/+3 | |
| * | mergetool--lib: simplify API usage by removing more global variables | David Aguilar | 2009-04-12 | 1 | -51/+58 | |
| * | difftool/mergetool: refactor commands to use git-mergetool--lib | David Aguilar | 2009-04-08 | 1 | -0/+378 | |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/git-mergetool--lib.sh