diff options
| author | Ryan Anderson <ryan@michonline.com> | 2006-07-03 21:30:02 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-03 18:43:49 -0700 |
| commit | 3f492ba1fc4e63073378cc097154bed1ed2563c8 (patch) | |
| tree | ed6ff4f8d8536c37238a32be1260ab2e248b84f4 /config.c | |
| parent | f560069bc59e155c3078ba5482ce69ded68849df (diff) | |
| download | git-3f492ba1fc4e63073378cc097154bed1ed2563c8.tar.gz git-3f492ba1fc4e63073378cc097154bed1ed2563c8.tar.xz | |
annotate: Correct most merge following to annotate correctly.
There is still a bug involving octopus merges, somewhere, but this gets normal
merges correct, so it's still an improvement over the existing version.
Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'config.c')
0 files changed, 0 insertions, 0 deletions