summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-22 16:05:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-23 22:34:43 -0700
commitfa7b290895ba2c4407ae818911ba620eaca53bbd (patch)
tree623c2c8db0b2036291caa12f9afb023cf9a98912 /.gitignore
parentdiff.c: return filepair from diff_unmerge() (diff)
downloadtgif-fa7b290895ba2c4407ae818911ba620eaca53bbd.tar.xz
diff: remove often unused parameters from diff_unmerge()
e9c8409 (diff-index --cached --raw: show tree entry on the LHS for unmerged entries., 2007-01-05) added a <mode, object name> pair as parameters to this function, to store them in the pre-image side of an unmerged file pair. Now the function is fixed to return the filepair it queued, we can make the caller on the special case codepath to do so. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions