summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-06-06 11:39:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-06 11:39:12 -0700
commit75866e60453c0c2a19f4de1bef56da34119bee3b (patch)
treed2f3b24d15910de7c8584f3df306e1c08544d7b1 /xdiff
parentMerge branch 'mc/git-p4-prepare-p4-only' (diff)
parentHow to keep a project's canonical history correct. (diff)
downloadtgif-75866e60453c0c2a19f4de1bef56da34119bee3b.tar.xz
Merge branch 'ss/howto-manage-trunk'
* ss/howto-manage-trunk: How to keep a project's canonical history correct.
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions