diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:39:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:39:38 -0700 |
| commit | 22ffc39a0332e892ddbf16b39d9b611aff238d9b (patch) | |
| tree | 90ed6d2bc6afd2a3867c2bdd770f951baa3014d6 /merge-recursive.h | |
| parent | t7406 & t7407: add missing && at end of lines (diff) | |
| parent | Git 1.7.2.3 (diff) | |
| download | git-22ffc39a0332e892ddbf16b39d9b611aff238d9b.tar.gz git-22ffc39a0332e892ddbf16b39d9b611aff238d9b.zip | |
Sync with 1.7.2.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions