diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-11-04 03:54:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-04 03:54:20 -0800 |
| commit | a622f6b35eb72b0ce738c03d6b49f760501bce78 (patch) | |
| tree | 9508a491cacb3a06092b694f83e58a2c9c163287 /git-merge-ours.sh | |
| parent | gitweb: Remove extra "/" in path names for git_get_project_list (diff) | |
| parent | apply: handle "traditional" creation/deletion diff correctly. (diff) | |
| download | tgif-a622f6b35eb72b0ce738c03d6b49f760501bce78.tar.xz | |
Merge branch 'maint'
* maint:
apply: handle "traditional" creation/deletion diff correctly.
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions