summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
Commit message (Expand)AuthorAgeFilesLines
* mergetool: avoid misleading message "Resetting to default..."Steffen Prohaska2007-10-181-1/+1
* mergetool: add support for ECMergeSteffen Prohaska2007-10-181-1/+11
* mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska2007-10-181-43/+54
* mergetool: Fix typo in options passed to kdiff3Theodore Ts'o2007-09-281-2/+2
* mergetool: fix emerge when running in a subdirectoryTheodore Ts'o2007-09-281-2/+2
* Mergetool generating blank files (1.5.3)Junio C Hamano2007-09-281-3/+4
* Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-231-1/+1
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-8/+8
* git-mergetool: Make default selection of merge-tool more intelligentTheodore Ts'o2007-06-101-17/+29
* [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee2007-06-101-2/+10
* Fix typo in git-mergetoolJosh Triplett2007-06-061-1/+1
* mergetool: Clean up description of files and prompts for merge resolutionsTheodore Ts'o2007-03-291-12/+15
* mergetool: Make git-rm quiet when resolving a deleted file conflictTheodore Ts'o2007-03-291-1/+1
* mergetool: Add support for Apple Mac OS X's opendiff commandTheodore Ts'o2007-03-291-2/+14
* mergetool: Fix abort command when resolving symlinks and deleted filesTheodore Ts'o2007-03-291-4/+4
* mergetool: Remove spurious error message if merge.tool config option not setTheodore Ts'o2007-03-291-1/+1
* mergetool: factor out common codeTheodore Ts'o2007-03-291-42/+36
* mergetool: portability fix: don't use reserved word functionTheodore Ts'o2007-03-291-5/+5
* mergetool: portability fix: don't assume true is in /binTheodore Ts'o2007-03-291-2/+2
* mergetool: Don't error out in the merge case where the local file is deletedTheodore Ts'o2007-03-291-6/+5
* mergetool: Replace use of "echo -n" with printf(1) to be more portableTheodore Ts'o2007-03-291-14/+12
* mergetool: print an appropriate warning if merge.tool is unknownTheodore Ts'o2007-03-181-4/+9
* mergetool: Add support for vimdiff.James Bowes2007-03-181-3/+5
* Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o2007-03-131-0/+352
View Lorry Controller Status