Win32: fix detection of empty directories in is_dir_empty
[git/dscho.git] / mergetools / p4merge
blob1a45c1b0c5128335fc340e7d6409b4e772419a07
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE"
5 merge_cmd () {
6         touch "$BACKUP"
7         $base_present || >"$BASE"
8         "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
9         check_unchanged