Merge branch 'pr/mergetool'
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 Dec 2007 09:01:50 +0000 (01:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Dec 2007 09:01:50 +0000 (01:01 -0800)
commit05e74f4...11b5ce5995dd1145f83398fe40a318e0
tree1425559...9f04cb53d2783188f8717ede7a1b682acopy hash to clipboard (tree)
parent9b433e4...964202befd175f1f28687067b8bd058fcopy hash to clipboard (diff)
parentc3d51cd...6a8db417b89608a37410cf3bf8a5b137copy hash to clipboard (diff)