diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-10 21:47:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-10 21:47:01 -0800 |
| commit | 8bb2b516d56722776255faaccc0b1d63e444a93e (patch) | |
| tree | 37d7bfcf32e63e27905db808b23bd25b8d03286a /git-merge-ours.sh | |
| parent | Documentation: s/seperator/separator/ (diff) | |
| parent | user-manual: install user manual stylesheet with other web documents (diff) | |
| download | tgif-8bb2b516d56722776255faaccc0b1d63e444a93e.tar.xz | |
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
* 'maint' of git://linux-nfs.org/~bfields/git:
user-manual: install user manual stylesheet with other web documents
user-manual: fix rendering of history diagrams
user-manual: fix missing colon in git-show example
user-manual: fix inconsistent use of pull and merge
user-manual: fix inconsistent example
glossary: fix overoptimistic automatic linking of defined terms
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions