Public Git Hosting - alt-git.git/commit

commit	6f37238747002b8118d92bc0ec6c986a5d7e56ad
author	Junio C Hamano <gitster@pobox.com>
	Mon, 24 Jun 2013 20:48:53 +0000 (24 13:48 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 24 Jun 2013 20:48:53 +0000 (24 13:48 -0700)
tree	40076791f6955066ea0d7c69cc176a13f17d4e0e	tree \| snapshot (tar.gz zip)
parent	c47d4380c7972bf94bd5ee425c3806398e00cb4d	commit \| diff
parent	d2512fc94fe75d8836a6fc965951d8180dbddbe6	commit \| diff

Merge branch 'jk/mergetool-lib-refactor'

Code cleanup.

* jk/mergetool-lib-refactor:
mergetool--lib: refactor {diff,merge}_cmd logic