![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 10 May 2006 02:24:16 +0000 (19:24 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 10 May 2006 02:24:16 +0000 (19:24 -0700) | ||
| commit | f7a3276bab880222e3117f8b8cbef40920dfe884 | |
| tree | 777beb161c10d03c8185d35fd0ac2a04f06850cb | tree | snapshot |
| parent | 8c2462dc5bd1aeb42eb5e07e82f9d062db43cd21 | commit | diff |
| parent | 8d7a397aab561d3782f531e733b617e0e211f04a | commit | diff |
Merge branch 'fix'
* fix:
checkout: use --aggressive when running a 3-way merge (-m).
revert/cherry-pick: use aggressive merge.
* fix:
checkout: use --aggressive when running a 3-way merge (-m).
revert/cherry-pick: use aggressive merge.