summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-08 06:50:57 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-08 08:23:12 (GMT)
commit067744bd5dc23540745788b5aa11d4e9dea1ceef (patch)
tree2058c03a324f06aff5d506574e55658da4c730ac /debian/changelog
parentfb612d54c1df7e45d174060c1cbdf060accceb6d (diff)
downloadgit-067744bd5dc23540745788b5aa11d4e9dea1ceef.zip
git-067744bd5dc23540745788b5aa11d4e9dea1ceef.tar.gz
git-067744bd5dc23540745788b5aa11d4e9dea1ceef.tar.bz2
Tutorial: do not use 'git resolve'.
Use 'git merge' instead. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'debian/changelog')
0 files changed, 0 insertions, 0 deletions