diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:44:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:44:46 -0700 |
| commit | e82c74618b24ddaad56f085f66c90da7ad7a0cb5 (patch) | |
| tree | 33f734238a21c6b5b4fba0bd7be832ae14dfda05 /builtin/commit.c | |
| parent | Merge branch 'jk/merge-one-file-working-tree' into maint (diff) | |
| parent | Pass empty file to p4merge where no base is suitable. (diff) | |
| download | git-e82c74618b24ddaad56f085f66c90da7ad7a0cb5.tar.gz git-e82c74618b24ddaad56f085f66c90da7ad7a0cb5.zip | |
Merge branch 'cj/p4merge' into maint
* cj/p4merge:
Pass empty file to p4merge where no base is suitable.
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions