diff options
| author | Jeff King <peff@peff.net> | 2008-03-08 20:27:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-08 21:30:05 -0800 |
| commit | 50753d00d691c1ea16bc72446705aee2c128fc2f (patch) | |
| tree | 87599cde48d64e3298c4051f3e6eb1d32f63ca01 /commit.c | |
| parent | 1cbcefb107776ce2da374697bb4f6e2bd22ff73f (diff) | |
| download | git-50753d00d691c1ea16bc72446705aee2c128fc2f.tar.gz git-50753d00d691c1ea16bc72446705aee2c128fc2f.tar.xz | |
Add a test for read-tree -u --reset with a D/F conflict
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions