Win32: fix detection of empty directories in is_dir_empty
[git/dscho.git] / mergetools / ecmerge
blob13c2e439def45fe6cf58ae4345355894463ba34f
1 diff_cmd () {
2         "$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
5 merge_cmd () {
6         touch "$BACKUP"
7         if $base_present
8         then
9                 "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
10                         --default --mode=merge3 --to="$MERGED"
11         else
12                 "$merge_tool_path" "$LOCAL" "$REMOTE" \
13                         --default --mode=merge2 --to="$MERGED"
14         fi
15         check_unchanged