Custom low-level merge driver support.

Junio C Hamano committed over 19 years ago

Merge branch 'fl/cvsserver'

Junio C Hamano committed over 19 years ago

Merge branch 'maint'

Junio C Hamano committed over 19 years ago

Merge branch 'maint'

Junio C Hamano committed over 19 years ago

Start preparing for 1.5.1.2

Junio C Hamano committed over 19 years ago

Merge branch 'master' of git://repo.or.cz/git-gui

Junio C Hamano committed over 19 years ago

Merge branch 'maint' of git://repo.or.cz/git-gui into maint

Junio C Hamano committed over 19 years ago

Merge branch 'jc/read-tree-df'

Junio C Hamano committed over 19 years ago

Add a demonstration/test of customized merge.

Junio C Hamano committed over 19 years ago

Allow specifying specialized merge-backend per path.

Junio C Hamano committed over 19 years ago

git-gui: Honor TCLTK_PATH if supplied

Junio C Hamano committed over 19 years ago

merge-recursive: separate out xdl_merge() interface.

Junio C Hamano committed over 19 years ago

Allow more than true/false to attributes.

Junio C Hamano committed over 19 years ago

← Newer Page 3613 of 4093 Older →