summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-01 22:55:40 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-01 22:55:40 -0700
commit746437d534a1fa84e210427a94972ed0c7f34ee5 (patch)
tree3ed4776ac36702873cc1299e066ed2f447d2d1f9 /xdiff-interface.c
parentMerge branch 'jc/pack' (diff)
parentExtended SHA1 -- "rev^@" syntax to mean "all parents" (diff)
downloadtgif-746437d534a1fa84e210427a94972ed0c7f34ee5.tar.xz
Merge branch 'jc/xsha1-2'
* jc/xsha1-2: Extended SHA1 -- "rev^@" syntax to mean "all parents"
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions