diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-23 18:51:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-23 18:51:02 -0700 |
| commit | a61399b5fb7f4b04d60f42b253cb0f684bcdd286 (patch) | |
| tree | 1df99e7bb47996ec765328a5adedc62f6340e8fe /git-merge-resolve.sh | |
| parent | GIT 0.99.7b (diff) | |
| parent | Further clarify licensing status of compat/subprocess.py. (diff) | |
| download | git-a61399b5fb7f4b04d60f42b253cb0f684bcdd286.tar.gz git-a61399b5fb7f4b04d60f42b253cb0f684bcdd286.zip | |
Merge 'fixes' branch
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions