diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-28 01:16:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-28 01:16:46 -0700 |
| commit | b0085a716770d9d2876edd74c6119c48d9d6f232 (patch) | |
| tree | 3658953cbb5a9a2fd1bab5fe0bf80781a6362383 /builtin-merge-ours.c | |
| parent | Update draft release notes to 1.6.3 (diff) | |
| parent | Merge branch 'maint-1.6.1' into maint (diff) | |
| download | tgif-b0085a716770d9d2876edd74c6119c48d9d6f232.tar.xz | |
Merge branch 'maint'
* maint:
test-lib: Clean up comments and Makefile.
diff --no-index: Do not generate patch output if other output is requested
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions