From: Łukasz Stelmach <lukasz.stelmach@iem.pw.edu.pl>
Date: Mon, 15 Mar 2010 11:34:14 GMT
Subject: merging unmanaged working tree
Message-ID: <87ljdtkedl.fsf@dasa3.iem.pw.edu.pl>

Hello.

Is there a method to (dry?) run git-merge to detect conflicts
on:

* current HEAD (or working tree)
* selected previous revision (the one used to "branch")
* directory tree (or a single file) "branched" with git-archive

I'd like to synchronize portable working tree but don't want to keep
history in it.

-- 
Miłego dnia,
Łukasz Stelmach