Skip to content
Snippets Groups Projects
Commit 014bd00c authored by Andreas Dilger's avatar Andreas Dilger
Browse files

Branch b1_4 

Put only the filenames into the cvs-merge-conflicts file, so that
vi `cat cvs-merge-conflicts` works.
parent 93040866
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy