diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:06:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:06:55 -0700 |
| commit | 328455fc588d8b5a9357f9b1c053cfffc8577e15 (patch) | |
| tree | 6ec5156e994fa69d302fcaae48366c8b1b2c71bc /resolve-undo.c | |
| parent | Merge branch 'we/submodule-update-prefix-output' (diff) | |
| parent | diff.c: diff.renamelimit => diff.renameLimit in message (diff) | |
| download | tgif-328455fc588d8b5a9357f9b1c053cfffc8577e15.tar.xz | |
Merge branch 'maint'
* maint:
diff.c: diff.renamelimit => diff.renameLimit in message
wt-status: fix possible use of uninitialized variable
fast-import: clarify "inline" logic in file_change_m
run-command: always set failed_errno in start_command
transport: drop "int cmp = cmp" hack
drop some obsolete "x = x" compiler warning hacks
fast-import: use pointer-to-pointer to keep list tail
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions