RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-02-08 14:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

admin-merge-2: more colors

Browse Source
This commit is contained in:
Rudolf Polzer 2010-05-18 21:20:42 +02:00
parent b01ac246fe
commit 1b78e522ee
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
all
View File

@ -660,7 +660,7 @@ case "$cmd" in
if [ -n "$note" ]; then if [ -n "$note" ]; then
reportdo4 echo "$note" reportdo4 echo "$note"
reportecho4 "--> not merging, already had this one rejected before" reportecho4 "--> not merging, already had this one rejected before"
elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log HEAD.."$ref"; git diff --color-words --find-copies-harder --ignore-space-change HEAD..."$ref"; } | less'; then elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log --color HEAD.."$ref"; git diff --color --color-words --find-copies-harder --ignore-space-change HEAD..."$ref"; } | less -r'; then
git checkout master git checkout master
org=`git rev-parse HEAD` org=`git rev-parse HEAD`
if ! git merge "$ref" 2>&1 | tee "$t"; then if ! git merge "$ref" 2>&1 | tee "$t"; then