]> asedeno.scripts.mit.edu Git - git.git/history - t/t6037-merge-ours-theirs.sh
projects / git.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'ap/merge-backend-opts'
[git.git] / t / t6037-merge-ours-theirs.sh
2010-01-21 Junio C HamanoMerge branch 'ap/merge-backend-opts' blob | commitdiff | raw
2010-01-18 Avery PennarunTeach git-pull to pass -X<option> to git-merge blob | commitdiff | raw
2010-01-18 Avery Pennarungit merge -X<option> blob | commitdiff | raw | diff to current
local clone of git.git