diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:47:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:47:08 -0700 |
| commit | 1bbc820414d94452d1417bb83db86309f34720a3 (patch) | |
| tree | 2eb3a4843174f6999a290da3e5b7c5b55173701a /commit.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | mergetool--lib: add support for araxis merge (diff) | |
| download | git-1bbc820414d94452d1417bb83db86309f34720a3.tar.gz git-1bbc820414d94452d1417bb83db86309f34720a3.zip | |
Merge branch 'da/araxis-mergetool'
* da/araxis-mergetool:
mergetool--lib: add support for araxis merge
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions