diff options
| author |  Fredrik Kuivinen <freku045@student.liu.se> | 2005-09-13 23:41:16 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-09-13 15:45:25 -0700 |
| commit | 6511cce24b932eba33d8e13b54664673121a8b7e (patch) | |
| tree | f3c477670b0fa7dd3fc9738b08e7e7b3f7ae1d63 /diff-stages.c | |
| parent | [PATCH] Adjust git-merge-recursive.py for the new tool names. (diff) | |
| download | tgif-6511cce24b932eba33d8e13b54664673121a8b7e.tar.xz | |
[PATCH] Use a temporary index file when we merge the common ancestors.
With this change we can get rid of a call to 'git-update-index
--refresh'.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff-stages.c')
0 files changed, 0 insertions, 0 deletions