projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 93e23fe) | patch
Fixing comment in merge strategies
authorTom Clarke <tom@u2i.com>
Thu, 30 Aug 2007 21:12:44 +0000 (23:12 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 31 Aug 2007 00:18:22 +0000 (17:18 -0700)
commit7d3c82a7610ac9ba11a26e1e594e48e0ebef629a
tree5a596ff963b44c62d9b6a115dca3751120c25df1tree | snapshot
parent93e23fea2d7538ac24e35b50984dbbbb84d89f9acommit | diff
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>
git-merge-resolve.sh diff | blob | history
git-merge-stupid.sh diff | blob | history
Git—the stupid content tracker