summaryrefslogtreecommitdiff
path: root/xdiff/xemit.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-11-05 10:42:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-05 10:42:46 -0700
commit3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e (patch)
treede988e8ec082d09e74dcd3d67b542c46577f5a35 /xdiff/xemit.c
parentMerge branch 'master' of git://repo.or.cz/git-gui (diff)
parentFix handling of git-p4 on deleted files (diff)
downloadtgif-3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e.tar.xz
Merge branch 'aw/git-p4-deletion'
* aw/git-p4-deletion: Fix handling of git-p4 on deleted files
Diffstat (limited to 'xdiff/xemit.c')
0 files changed, 0 insertions, 0 deletions