Win32: fix detection of empty directories in is_dir_empty
[git/dscho.git] / mergetools / kdiff3
blob28fead428b333448566f480a434967fb7325c744
1 diff_cmd () {
2         "$merge_tool_path" --auto \
3                 --L1 "$MERGED (A)" --L2 "$MERGED (B)" \
4                 "$LOCAL" "$REMOTE" >/dev/null 2>&1
7 merge_cmd () {
8         if $base_present
9         then
10                 "$merge_tool_path" --auto \
11                         --L1 "$MERGED (Base)" \
12                         --L2 "$MERGED (Local)" \
13                         --L3 "$MERGED (Remote)" \
14                         -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \
15                 >/dev/null 2>&1
16         else
17                 "$merge_tool_path" --auto \
18                         --L1 "$MERGED (Local)" \
19                         --L2 "$MERGED (Remote)" \
20                         -o "$MERGED" "$LOCAL" "$REMOTE" \
21                 >/dev/null 2>&1
22         fi
23         status=$?