global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-24 17:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
238cc6352eabe3f87f13093bc4015162bf424509
git/git-mergetool.sh
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>
2007-03-29 22:46:16 -04:00

7.7 KiB
Executable File
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink