git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-22 02:54:28 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
5478285961996560147e2fd39daf45b79f580641
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