diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-04 00:10:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-04 00:10:48 -0700 |
| commit | b266b123cd3124497a1d006cb126033ce458a85c (patch) | |
| tree | bd553f3956bb80a96d8b0d12e78148aab99db0ad /contrib/emacs/Makefile | |
| parent | Merge branch 'new' of git://git.kernel.org/pub/scm/gitk/gitk into next (diff) | |
| download | tgif-b266b123cd3124497a1d006cb126033ce458a85c.tar.xz | |
Fix earlier mismerges.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib/emacs/Makefile')
0 files changed, 0 insertions, 0 deletions