| Commit message (Expand) | Author | Age |
* | mergetool: Make ECMerge use the settings as specified by the user in the GUI | Sebastian Schuberth | 2008-05-11 |
* | Teach git mergetool to use custom commands defined at config time | Charles Bailey | 2008-03-05 |
* | Changed an internal variable of mergetool to support custom commands | Charles Bailey | 2008-03-05 |
* | Tidy up git mergetool's backup file behaviour | Charles Bailey | 2008-03-05 |
* | Allow git-mergetool to handle paths with a leading space | Rogan Dawes | 2008-01-07 |
* | Open external merge tool with original file extensions for all three files | Pini Reznik | 2007-12-05 |
* | scripts: Add placeholders for OPTIONS_SPEC | Junio C Hamano | 2007-11-06 |
* | mergetool: avoid misleading message "Resetting to default..." | Steffen Prohaska | 2007-10-18 |
* | mergetool: add support for ECMerge | Steffen Prohaska | 2007-10-18 |
* | mergetool: use path to mergetool in config var mergetool.<tool>.path | Steffen Prohaska | 2007-10-18 |
* | mergetool: Fix typo in options passed to kdiff3 | Theodore Ts'o | 2007-09-28 |
* | mergetool: fix emerge when running in a subdirectory | Theodore Ts'o | 2007-09-28 |
* | Mergetool generating blank files (1.5.3) | Junio C Hamano | 2007-09-28 |
* | Supplant the "while case ... break ;; esac" idiom | David Kastrup | 2007-09-23 |
* | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 |
* | git-mergetool: Make default selection of merge-tool more intelligent | Theodore Ts'o | 2007-06-10 |
* | [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool | Dan McGee | 2007-06-10 |
* | Fix typo in git-mergetool | Josh Triplett | 2007-06-06 |
* | mergetool: Clean up description of files and prompts for merge resolutions | Theodore Ts'o | 2007-03-29 |
* | mergetool: Make git-rm quiet when resolving a deleted file conflict | Theodore Ts'o | 2007-03-29 |
* | mergetool: Add support for Apple Mac OS X's opendiff command | Theodore Ts'o | 2007-03-29 |
* | mergetool: Fix abort command when resolving symlinks and deleted files | Theodore Ts'o | 2007-03-29 |
* | mergetool: Remove spurious error message if merge.tool config option not set | Theodore Ts'o | 2007-03-29 |
* | mergetool: factor out common code | Theodore Ts'o | 2007-03-29 |
* | mergetool: portability fix: don't use reserved word function | Theodore Ts'o | 2007-03-29 |
* | mergetool: portability fix: don't assume true is in /bin | Theodore Ts'o | 2007-03-29 |
* | mergetool: Don't error out in the merge case where the local file is deleted | Theodore Ts'o | 2007-03-29 |
* | mergetool: Replace use of "echo -n" with printf(1) to be more portable | Theodore Ts'o | 2007-03-29 |
* | mergetool: print an appropriate warning if merge.tool is unknown | Theodore Ts'o | 2007-03-18 |
* | mergetool: Add support for vimdiff. | James Bowes | 2007-03-18 |
* | Add git-mergetool to run an appropriate merge conflict resolution program | Theodore Ts'o | 2007-03-13 |