diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-14 00:45:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-15 01:21:38 (GMT) |
| commit | 98efc8f3d890a0c671b7e2000e43b2e0a96b9a73 (patch) | |
| tree | ac506f25b4eebedb2731b0bc470a87e94d9dde51 /templates | |
| parent | 9e9b26751a5ca7a257b3e1cfb319fe3e4efc663c (diff) | |
| download | git-98efc8f3d890a0c671b7e2000e43b2e0a96b9a73.zip git-98efc8f3d890a0c671b7e2000e43b2e0a96b9a73.tar.gz git-98efc8f3d890a0c671b7e2000e43b2e0a96b9a73.tar.bz2 | |
octopus: allow manual resolve on the last round.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions