diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-10 06:24:16 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-10 06:24:16 +0400 |
| commit | f7a3276bab880222e3117f8b8cbef40920dfe884 (patch) | |
| tree | 777beb161c10d03c8185d35fd0ac2a04f06850cb /diff-delta.c | |
| parent | 8c2462dc5bd1aeb42eb5e07e82f9d062db43cd21 (diff) | |
| parent | 8d7a397aab561d3782f531e733b617e0e211f04a (diff) | |
Merge branch 'fix'
* fix:
checkout: use --aggressive when running a 3-way merge (-m).
revert/cherry-pick: use aggressive merge.
Diffstat (limited to 'diff-delta.c')
0 files changed, 0 insertions, 0 deletions