Win32: fix detection of empty directories in is_dir_empty
[git/dscho.git] / mergetools / tortoisemerge
blobed7db495eda9b70bee7e077a0de07d30518cbf2a
1 can_diff () {
2         return 1
5 merge_cmd () {
6         if $base_present
7         then
8                 touch "$BACKUP"
9                 "$merge_tool_path" \
10                         -base:"$BASE" -mine:"$LOCAL" \
11                         -theirs:"$REMOTE" -merged:"$MERGED"
12                 check_unchanged
13         else
14                 echo "TortoiseMerge cannot be used without a base" 1>&2
15                 return 1
16         fi