diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-01 16:22:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-01 16:22:42 -0700 |
| commit | 5e707b28d9ea0bebfef5aff977e3ccebd53aa045 (patch) | |
| tree | 866254290cfe6006a269386770b26936d718a5ae /diff-lib.c | |
| parent | Merge branch 'js/apply-recount' (diff) | |
| parent | Remove the use of '--' in merge program invocation (diff) | |
| download | tgif-5e707b28d9ea0bebfef5aff977e3ccebd53aa045.tar.xz | |
Merge branch 'ph/mergetool'
* ph/mergetool:
Remove the use of '--' in merge program invocation
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions