diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-06-26 18:08:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-26 18:08:51 -0700 |
| commit | 7ac749c96d143ba4f76723959892cbaddbe8ed07 (patch) | |
| tree | 656a0719d05ffa31d1d197fdde17960bf92c4abe /builtin-merge-file.c | |
| parent | diff --check: do not discard error status upon seeing a good line (diff) | |
| parent | GIT 1.5.5.5 (diff) | |
| download | tgif-7ac749c96d143ba4f76723959892cbaddbe8ed07.tar.xz | |
Merge branch 'maint-1.5.5' into maint
* maint-1.5.5:
GIT 1.5.5.5
GIT 1.5.4.6
git-shell: accept "git foo" form
Conflicts:
GIT-VERSION-GEN
RelNotes
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions