diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-12 01:24:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-12 01:24:35 (GMT) |
| commit | 2b64f88f09ae2169ec85652b46897574e352936d (patch) | |
| tree | d9574aee746fd374b8ef851da1d19e9030d4bb56 /merge-base.c | |
| parent | bf570303153902ec3d85570ed24515bcf8948848 (diff) | |
| parent | b664550c066810b770ad3e19cafe2fbdd42c6793 (diff) | |
| download | git-2b64f88f09ae2169ec85652b46897574e352936d.zip git-2b64f88f09ae2169ec85652b46897574e352936d.tar.gz git-2b64f88f09ae2169ec85652b46897574e352936d.tar.bz2 | |
Merge with gitk.
This merges commit
b664550c066810b770ad3e19cafe2fbdd42c6793
from gitk into our head commit
bf570303153902ec3d85570ed24515bcf8948848
Sincerely,
jit-merge command.
Diffstat (limited to 'merge-base.c')
0 files changed, 0 insertions, 0 deletions