My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bba5367 94883b4)
Merge branch 'jk/merge-tree-added-identically'
authorJunio C Hamano <gitster@pobox.com>
Tue, 7 May 2013 05:18:25 +0000 (22:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 May 2013 05:18:25 +0000 (22:18 -0700)
* jk/merge-tree-added-identically:
  merge-tree: handle directory/empty conflict correctly


Trivial merge
The core git plumbing