Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 02:42:21 +0000 (19:42 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 02:42:21 +0000 (19:42 -0700)
commit55a716c...8c93fd2eb161ae17f316ee01e8061be6
treecf4134d...76441b019a7bc3c3899c268c77cbce79copy hash to clipboard (tree)
parent31b6d20...d6c5ed019f62d88ef0926faeb0150aaccopy hash to clipboard (diff)
git-resolve-script