diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-07-24 21:39:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-25 00:06:53 -0700 |
| commit | f48a203a563ae8a46daa8b8923b5d81dc40502fb (patch) | |
| tree | 9a2e58c14365ac16918d7f6e8ed53d211bc88401 /builtin-merge-file.c | |
| parent | git.el: Pass an explicit argument to enable smerge-mode. (diff) | |
| download | tgif-f48a203a563ae8a46daa8b8923b5d81dc40502fb.tar.xz | |
GIT 1.5.3-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions