diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:48:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:50:44 -0700 |
| commit | 49d3536594e653717844d53825fa7c0a494888f7 (patch) | |
| tree | 35022ab151934461b2a9f21cce140b5a773369c6 /git-merge-resolve.sh | |
| parent | git-submodule - Use "get_default_remote" from git-parse-remote (diff) | |
| parent | GIT 1.6.0.1 (diff) | |
| download | tgif-49d3536594e653717844d53825fa7c0a494888f7.tar.xz | |
Merge branch 'maint' to sync with 1.6.0.1
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions