diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-17 15:39:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-17 15:39:43 -0700 |
| commit | 1c71541ddd51968ca2957063b00da42941d13d98 (patch) | |
| tree | 8d7033f891dbb1964103488e5b7045e556c2cc84 /mergetools/vimdiff2 | |
| parent | Merge branch 'maint' (diff) | |
| parent | t1507: Test that branchname@{upstream} is interpreted as branch (diff) | |
| download | tgif-1c71541ddd51968ca2957063b00da42941d13d98.tar.xz | |
Merge branch 'maint'
* maint:
t1507: Test that branchname@{upstream} is interpreted as branch
Diffstat (limited to 'mergetools/vimdiff2')
0 files changed, 0 insertions, 0 deletions