sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Re: [SM-Discuss] git merge

From: Jaka Kranjc <lynx AT mages.ath.cx>
To: sm-discuss AT lists.ibiblio.org
Subject: Re: [SM-Discuss] git merge
Date: Sun, 25 Jun 2006 11:16:28 +0200

> Auto-merging kde-core/kdelibs/HISTORY
merge is from rcs, but I doubt it would help with HISTORY files. Just edit it
and remove the conflict markers.

--
We cannot command nature except by obeying her. --Sir Francis Bacon

Attachment: pgpAKUFtU_894.pgp
Description: PGP signature

[SM-Discuss] git merge, Treeve Jelbert, 06/25/2006
- Re: [SM-Discuss] git merge, Pieter Lenaerts, 06/25/2006
- Re: [SM-Discuss] git merge, Jaka Kranjc, 06/25/2006
  - Re: [SM-Discuss] git merge, Arwed von Merkatz, 06/25/2006