![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Dec 2007 09:01:50 +0000 (01:01 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Dec 2007 09:01:50 +0000 (01:01 -0800) | ||
| commit | 05e74f4111b5ce5995dd1145f83398fe40a318e0 | |
| tree | 142555949f04cb53d2783188f8717ede7a1b682a | tree | snapshot |
| parent | 9b433e44964202befd175f1f28687067b8bd058f | commit | diff |
| parent | c3d51cd16a8db417b89608a37410cf3bf8a5b137 | commit | diff |
Merge branch 'pr/mergetool'
* pr/mergetool:
Open external merge tool with original file extensions for all three files
* pr/mergetool:
Open external merge tool with original file extensions for all three files