Win32: fix detection of empty directories in is_dir_empty
[git/dscho.git] / mergetools / diffuse
blob02e0843f47e09a7cc6cdd2a9c70e36773ecc96af
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
5 merge_cmd () {
6         touch "$BACKUP"
7         if $base_present
8         then
9                 "$merge_tool_path" \
10                         "$LOCAL" "$MERGED" "$REMOTE" \
11                         "$BASE" | cat
12         else
13                 "$merge_tool_path" \
14                         "$LOCAL" "$MERGED" "$REMOTE" | cat
15         fi
16         check_unchanged