keyword: avoid additional conflicts during merge/resolve
Make merge and resolve trigger kwtemplater.restricted to compare
data without keyword expansion.
The keyword stays outside the conflict:
$Keyword$
<<<<<<< local
bar
=======
foo
>>>>>>> other
and will again be expanded on commit.
Demonstrate in test case.
% init
% setup
% delete an empty directory
empty_dir
Removing directory empty_dir
directory
r1
% delete an untracked directory
untracked_dir/untracked_file1
untracked_dir/untracked_file2
Removing file untracked_dir/untracked_file1
Removing file untracked_dir/untracked_file2
Removing directory untracked_dir
directory
r1
% delete an untracked file
untracked_file
Removing file untracked_file
directory
r1
% delete an untracked file in a tracked directory
directory/untracked_file
Removing file directory/untracked_file
directory
r1
% delete nested directories
untracked_directory/nested_directory
Removing directory untracked_directory/nested_directory
Removing directory untracked_directory
directory
r1
% delete nested directories from a subdir
untracked_directory/nested_directory
Removing directory untracked_directory/nested_directory
Removing directory untracked_directory
directory
r1
% delete only part of the tree
untracked_directory/nested_directory
Removing directory untracked_directory/nested_directory
Removing directory untracked_directory
directory
r1
directory/untracked_file
% skip ignored files if --all not specified
directory
ignored
r1
ignored
Removing file ignored
directory
r1
% abort with missing files until we support name mangling filesystems
untracked_file
! r1
? untracked_file
untracked_file
Removing file untracked_file
! r1
% tracked file in ignored directory (issue621)
untracked_file
Removing file untracked_file
% skip excluded files
directory
excluded_file
r1
% skip files in excluded dirs
directory
excluded_dir
r1
file
% skip excluded empty dirs
directory
excluded_dir
r1
% skip patterns