[PATCH] Make "git resolve" less scary
authorLinus Torvalds <torvalds@osdl.org>
Tue, 30 Aug 2005 05:36:16 +0000 (22:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 30 Aug 2005 05:55:42 +0000 (22:55 -0700)
commitcdcb0ed...11021cf8a8db047667e5ae18c4378ec0
treedd88d40...026b1b29bebc010f34ccc89ec8a4a1c5copy hash to clipboard (tree)
parent8d0991d...d7d7e68ef39fe8d302f43110ef2c65d1copy hash to clipboard (diff)
git-merge-one-file-script