My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c47d438 d2512fc)
Merge branch 'jk/mergetool-lib-refactor'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:53 +0000 (13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:53 +0000 (13:48 -0700)
Code cleanup.

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


Trivial merge
The core git plumbing