| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | mergetools: stop setting $status in merge_cmd()da/difftool-mergetool-simplify-reporting-status | David Aguilar | 2014-11-21 | 1 | -1/+0 |
| | | | | | | | | | No callers rely on $status so there's don't need to set it during merge_cmd() for diffmerge, emerge, and kdiff3. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | ||||
| * | mergetool--lib: Refactor tools into separate files | David Aguilar | 2011-08-19 | 1 | -0/+23 |
| Individual merge tools are now defined in a mergetools/$tool file which is sourced at runtime. The individual files are installed into $(git --exec-path)/mergetools/. New tools can be added by creating a new file instead of editing the git-mergetool--lib.sh scriptlet. http://thread.gmane.org/gmane.comp.version-control.git/134906/focus=135006 Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | |||||
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |