projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 98294e9 35ffe75)
Merge branch 'jc/merge-blobs'
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:34:24 +0000 (18:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:34:24 +0000 (18:34 -0800)
commitc566ea13fd25be8a7c20bdf3644d1ebe3f65b690
tree90662464e689e56c23333d0041cdce7974e16a77tree | snapshot
parent98294e9875c05cdf2d4f16d446cb89ba6d41014acommit | diff
parent35ffe7583108ab236dcf81226690388491d9962fcommit | diff
Merge branch 'jc/merge-blobs'

Update the disused merge-tree proof-of-concept code.

* jc/merge-blobs:
  merge-tree: fix d/f conflicts
  merge-tree: add comments to clarify what these functions are doing
  merge-tree: lose unused "resolve_directories"
  merge-tree: lose unused "flags" from merge_list
  Which merge_file() function do you mean?
Makefile diff1 | diff2 | blob | history
Git—the stupid content tracker