diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-12-09 01:01:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-09 01:01:50 -0800 |
| commit | 05e74f4111b5ce5995dd1145f83398fe40a318e0 (patch) | |
| tree | 142555949f04cb53d2783188f8717ede7a1b682a /builtin-merge-ours.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | Open external merge tool with original file extensions for all three files (diff) | |
| download | tgif-05e74f4111b5ce5995dd1145f83398fe40a318e0.tar.xz | |
Merge branch 'pr/mergetool'
* pr/mergetool:
Open external merge tool with original file extensions for all three files
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions