Win32: fix detection of empty directories in is_dir_empty
[git/dscho.git] / mergetools / opendiff
blob0942b2a733592d3f0a5a39b4fc1defd635eb7b04
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" "$LOCAL" "$REMOTE" \
10                         -ancestor "$BASE" -merge "$MERGED" | cat
11         else
12                 "$merge_tool_path" "$LOCAL" "$REMOTE" \
13                         -merge "$MERGED" | cat
14         fi
15         check_unchanged