diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2007-03-29 19:39:46 +0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-03-30 06:46:16 +0400 |
| commit | 27090aa1eabdc44553a0d8a51ff4ab9543c64c65 (patch) | |
| tree | 83d2244e6507325f78eef2f5535d161223f3a7a6 /git-merge-ours.sh | |
| parent | 1346c9996350e96c7b38a57ede5d503821d84fe3 (diff) | |
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>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions