#!/bin/bash -e
LOG=~/all/ucm-tools/merge.log
for D in bin sbin sh; do
	cd ~/"$D"
	for A in *; do
		if [ "$A" = "*" ]; then continue; fi
		B=~/all/ucm-tools/"$D/$A"
		if [ -e "$B" ]; then
			vimdiff "$B" "$A"
			mr "$A" 2>>"$LOG"
		else
			mv -v "$A" "$B" 2>>"$LOG"
		fi
	done
done