From: Alex Riesen Date: Sun, 17 Feb 2008 12:57:14 GMT Subject: Re: [RFH] Add some very basic tests for git mergetool Message-ID: <20080217125714.GA3925@steel.home> In-Reply-To: <20080217103545.GA24158@hashpling.org> Charles Bailey, Sun, Feb 17, 2008 11:35:45 +0100: > I tried to add some basic tests for git mergetool but unfortunately I > hit a major stumbling block. I seem to have to include a delay in my > fake mergetool otherwise the cat command didn't seem to work. It was > as though the source file hadn't been writted out yet. I removed your delay and the test works every time. Could you strace the test (with "-ff -e open")? > I'm not sure if there's a shell usleep instead of having to "sleep 1", Just FYI: coreutils' sleep allows for subsecond sleeps.