summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-07-15 12:08:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-15 12:08:25 -0700
commit4cd1b99c32d9a345438d098f37e75077d072778f (patch)
treedead0a8c55e9d812224c8966290249cb85aecd53 /wt-status.c
parentMerge branch 'ns/merge-recursive-uptodate' (diff)
parentdiff A...B: give one possible diff when there are more than one merge-base (diff)
downloadtgif-4cd1b99c32d9a345438d098f37e75077d072778f.tar.xz
Merge branch 'jc/diff-merge-base-multi'
* jc/diff-merge-base-multi: diff A...B: give one possible diff when there are more than one merge-base
Diffstat (limited to 'wt-status.c')
0 files changed, 0 insertions, 0 deletions