diff options
| author | Jeff King <peff@peff.net> | 2012-10-25 06:42:57 -0400 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-25 06:42:57 -0400 |
| commit | 33d3c6bb9bcc10b9aa5e46f66ef516c649b2c703 (patch) | |
| tree | 7715f2d419da7fbc136239f87649970132804417 /commit.c | |
| parent | Merge branch 'jc/test-say-color-avoid-echo-escape' (diff) | |
| parent | mergetools/p4merge: Handle "/dev/null" (diff) | |
| download | git-33d3c6bb9bcc10b9aa5e46f66ef516c649b2c703.tar.gz git-33d3c6bb9bcc10b9aa5e46f66ef516c649b2c703.zip | |
Merge branch 'da/mergetools-p4'
* da/mergetools-p4:
mergetools/p4merge: Handle "/dev/null"
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions