mergetool: Clean up description of files and prompts for merge resolutions
authorTheodore Ts'o <tytso@mit.edu>
Thu, 29 Mar 2007 15:39:46 +0000 (11:39 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 30 Mar 2007 02:46:16 +0000 (22:46 -0400)
commit27090aa...eabdc44553a0d8a51ff4ab9543c64c65
tree83d2244...6507325f78eef2f5535d161223f3a7a6copy hash to clipboard (tree)
parent1346c99...6350e96c7b38a57ede5d503821d84fe3copy hash to clipboard (diff)
git-mergetool.sh