Artifact f9b6f5c151719451b2e2b7404ad54e41e9643efb:
- Executable file mergetest-git.sh — part of check-in [500150bfc8] at 2011-05-10 21:51:52 on branch trunk — Added example in document for settings in git and fossil. (user: peter.spjuth@gmail.com size: 334)
#!/bin/sh # Build up a merge conflict in git mkdir apa_git cd apa_git git init cp ../tests/ancestor.txt a.txt git add a.txt git commit -m a git checkout -b b cp ../tests/right.txt a.txt git commit -am r git checkout master cp ../tests/left.txt a.txt git commit -am l git checkout b #git merge master #git mergetool #git commit -am m