Skip to Content.
Sympa Menu

sm-discuss - Re: [SM-Discuss] git merge

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • 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




Archive powered by MHonArc 2.6.24.

Top of Page