Which merge_file() function do you mean?

Junio C Hamano committed almost 14 years ago

t9402: Use TABs for indentation

Torsten Bögershausen committed almost 14 years ago

t9402: Rename check.cvsCount and check.list

Torsten Bögershausen committed almost 14 years ago

t9402: Simplify git ls-tree

Torsten Bögershausen committed almost 14 years ago

t9402: Add missing &&; Code style

Torsten Bögershausen committed almost 14 years ago

t9402: No space after IO-redirection

Torsten Bögershausen committed almost 14 years ago

t9402: Dont use test_must_fail cvs

Torsten Bögershausen committed almost 14 years ago

t9402: improve check_end_tree() and check_end_full_tree()

Torsten Bögershausen committed almost 14 years ago

t9402: sed -i is not portable

Torsten Bögershausen committed almost 14 years ago

git(1): remove a defunct link to "list of authors"

Junio C Hamano committed almost 14 years ago

Git 1.8.1-rc1

Junio C Hamano committed almost 14 years ago

Documentation/diff-config: work around AsciiDoc misfortune

Junio C Hamano committed almost 14 years ago

Merge branch 'maint'

Junio C Hamano committed almost 14 years ago

Update draft release notes to 1.8.0.2

Junio C Hamano committed almost 14 years ago

Merge branch 'jc/doc-push-satellite' into maint

Junio C Hamano committed almost 14 years ago

Merge branch 'jc/same-encoding' into maint

Junio C Hamano committed almost 14 years ago

Merge branch 'lt/diff-stat-show-0-lines' into maint

Junio C Hamano committed almost 14 years ago

git-remote-helpers.txt: clarify options & ref list attributes

Max Horn committed almost 14 years ago

git-remote-helpers.txt: clarify command <-> capability correspondences

Max Horn committed almost 14 years ago

git-remote-helpers.txt: rearrange description of capabilities

Max Horn committed almost 14 years ago