diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:19 -0800 |
| commit | 630724ca79b1a7893a8d9c04367eae857ff1a7b0 (patch) | |
| tree | b1eb1c999bf904e164a0f48e1621ee74c981514d /xdiff/xprepare.c | |
| parent | Merge branch 'il/rev-glob' (diff) | |
| parent | branch -d: base the "already-merged" safety on the branch it merges with (diff) | |
| download | tgif-630724ca79b1a7893a8d9c04367eae857ff1a7b0.tar.xz | |
Merge branch 'jc/branch-d'
* jc/branch-d:
branch -d: base the "already-merged" safety on the branch it merges with
Diffstat (limited to 'xdiff/xprepare.c')
0 files changed, 0 insertions, 0 deletions