alecjacobson · August 7, 2025 18:37
diff --git a/filemerge b/filemerge
 #!/bin/sh

 # https://stackoverflow.com/questions/13719122/how-to-use-opendiff-as-default-mergetool/36841553#36841553
 # https://apple.stackexchange.com/questions/476348/use-apples-filemerge-from-command-line-and-have-it-wait-instead-of-exiting-imme
 file1=$(readlink -f  "$1")
 file2=$(readlink -f  "$2")
 open -a FileMerge -n -W --args -left "$file1" -right "$file2"
	#!/bin/sh

	# https://stackoverflow.com/questions/13719122/how-to-use-opendiff-as-default-mergetool/36841553#36841553
	# https://apple.stackexchange.com/questions/476348/use-apples-filemerge-from-command-line-and-have-it-wait-instead-of-exiting-imme
	file1=$(readlink -f "$1")
	file2=$(readlink -f "$2")
	open -a FileMerge -n -W --args -left "$file1" -right "$file2"