git-resolve-script: don't wait for three seconds any more
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 00:39:14 +0000 (17:39 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 00:39:14 +0000 (17:39 -0700)
commit3f4eff7...308b86fe462a2333108470bd6556e3c4
treebd808c0...1610bf2adeced95c5fd1243f47771f22copy hash to clipboard (tree)
parentc7c4bbe...3193f580abd2460e96dd7e65f2d4904ccopy hash to clipboard (diff)
git-resolve-script