[PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse
authorDan Holmsand <holmsand@gmail.com>
Mon, 20 Jun 2005 18:52:38 +0000 (20:52 +0200)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 22:49:39 +0000 (15:49 -0700)
commitc591412...c0aaf10890cdda4cf97a4fbc782d7d49
treec838831...8003834315e2c2ba7e9a76430888f094copy hash to clipboard (tree)
parent800644c...cb3aad99a229a09112f42fa88b63c1c4copy hash to clipboard (diff)
git-resolve-script