@@ -1,3 +1,3 @@ #!/bin/sh -/Applications/DiffMerge.app/Contents/MacOS/DiffMerge $1 $2 +/Applications/DiffMerge.app/Contents/MacOS/DiffMerge $1 $2 & diffmerge 1fb83be2d2999a00640c75a0c5a2bfb925063df3 Max Bolingbroke batterseapower@hotmail.com http://github.com/batterseapower/scripts/commit/291d4d87e4da429ef10eef638b598fa1aa33c1c4 291d4d87e4da429ef10eef638b598fa1aa33c1c4 2008-12-29T13:52:58-08:00 2008-12-29T13:52:58-08:00 Ensure diffmerge starts in the background 644480a178ae8bd446c4e1b31b26ed0db615cce6 Max Bolingbroke batterseapower@hotmail.com