projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2173205 a60521b)
Merge branch 'jc/merge-blobs' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2013 18:03:41 +0000 (10:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2013 18:03:41 +0000 (10:03 -0800)
commit686b895928efcd577b541f589a016fc0182f3a2f
treec44ca0825de99786cd7356217b321b35f3a51c70tree | snapshot
parent2173205f5c6e0e87c282cf94c13c8a41935cb1a2commit | diff
parenta60521bc6099ce89d05ef2160d2e3c30a106fda7commit | diff
Merge branch 'jc/merge-blobs' into maint

* jc/merge-blobs:
  Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
  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