Merge branch 'cb/mergetool'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 03:40:35 +0000 (19:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 03:40:35 +0000 (19:40 -0800)
commitb371922...a5b972557cd143461250a9d360882285
tree8cd7e43...ae0bf16e890cc909988ab16bb2b0a554copy hash to clipboard (tree)
parent84b9627...cc164b748b2c9dbe489f8d7b30bbbc4ecopy hash to clipboard (diff)
parentff4a185...2aa48f3227e2465072951dacc34aee9bcopy hash to clipboard (diff)
git-mergetool.sh