summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorLibravatar Thomas Harning <harningt@gmail.com>2007-11-22 15:19:40 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-11-22 14:21:59 -0800
commita00a42ae33708caa742d9e9fbf10692cfa42f032 (patch)
treed14676ffff8533ab5edd6c9bc790097c6f7e5dd6 /cache.h
parentRefactor patch_update_cmd (diff)
downloadtgif-a00a42ae33708caa742d9e9fbf10692cfa42f032.tar.xz
git-merge-ours: make it a builtin.
Except that this fixes a longstanding corner case bug by tightening the way underlying diff-index command is run, it is functionally equivalent to the scripted version. Signed-off-by: Thomas Harning Jr <harningt@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions