From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Jun 2013 20:48:53 +0000 (-0700)
Subject: Merge branch 'jk/mergetool-lib-refactor'
X-Git-Tag: v1.8.4-rc0~132
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=6f37238747002b8118d92bc0ec6c986a5d7e56ad;p=git.git

Merge branch 'jk/mergetool-lib-refactor'

Code cleanup.

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

6f37238747002b8118d92bc0ec6c986a5d7e56ad