kernel/git - git - PowerEL Git System

Tree: aa36985161

Author	SHA1	Message	Date
Theodore Ts'o	27090aa1ea	mergetool: Clean up description of files and prompts for merge resolutions This fixes complaints from Junio for how messages and prompts are printed when resolving symlink and deleted file merges. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Theodore Ts'o	1346c99963	mergetool: Make git-rm quiet when resolving a deleted file conflict Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Theodore Ts'o	365cf979c4	mergetool: Add support for Apple Mac OS X's opendiff command Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Theodore Ts'o	5a174f1a2e	mergetool: Fix abort command when resolving symlinks and deleted files Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Theodore Ts'o	b7b36f92fd	mergetool: Remove spurious error message if merge.tool config option not set Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Theodore Ts'o	ddc0c49753	mergetool: factor out common code Create common function check_unchanged(), save_backup() and remove_backup(). Also fix some minor whitespace issues while we're at it. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Theodore Ts'o	262c981ea7	mergetool: portability fix: don't use reserved word function Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Theodore Ts'o	d1dc6959bb	mergetool: portability fix: don't assume true is in /bin Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Theodore Ts'o	ce5b6d752b	mergetool: Don't error out in the merge case where the local file is deleted If the file we are trying to merge resolve is in git-ls-files -u, then skip the file existence test. If the file isn't reported in git-ls-files, then check to see if the file exists or not to give an appropriate error message. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Theodore Ts'o	20fa04ea6b	mergetool: Replace use of "echo -n" with printf(1) to be more portable Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Theodore Ts'o	d6678c28e3	mergetool: print an appropriate warning if merge.tool is unknown Also add support for vimdiff Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
James Bowes	9cec65399d	mergetool: Add support for vimdiff. Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Theodore Ts'o	c4b4a5af16	Add git-mergetool to run an appropriate merge conflict resolution program The git-mergetool program can be used to automatically run an appropriate merge resolution program to resolve merge conflicts. It will automatically run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago

13 Commits (aa3698516109df16f763ed2f0182075edabd7ea0)