| commit | 7d3c82a7610ac9ba11a26e1e594e48e0ebef629a | |
| author | Tom Clarke <tom@u2i.com> | |
| Thu, 30 Aug 2007 21:12:44 +0000 (30 23:12 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 31 Aug 2007 00:18:22 +0000 (30 17:18 -0700) | ||
| tree | 5a596ff963b44c62d9b6a115dca3751120c25df1 | treesnapshot (tar.gz zip) |
| parent | 93e23fea2d7538ac24e35b50984dbbbb84d89f9a | commitdiff |
Fixing comment in merge strategies
Comments in both these strategies refer to the wrong number
of remotes
Signed-off-by: Tom Clarke <tom@u2i.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Comments in both these strategies refer to the wrong number
of remotes
Signed-off-by: Tom Clarke <tom@u2i.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-merge-resolve.sh | diffblobblamehistory | |
| git-merge-stupid.sh | diffblobblamehistory |