diff options
| -rw-r--r-- | demo-script | 1 | ||||
| -rwxr-xr-x | prompt | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/demo-script b/demo-script index 0c18bf9..58e269a 100644 --- a/demo-script +++ b/demo-script @@ -1,3 +1,4 @@ +<<<<<<< HEAD:demo-script . /t/prompt/prompt test -d demo && rm -rf demo/ test -d ../demo && cd .. && rm -rf demo/ @@ -307,8 +307,9 @@ PROMPT_COMMAND=' /^# Changes to be committed:/,/^# [A-Z]/ { s/^# Changes to be committed:/added=added/p s/^# modified: /git_added_files+=\" \"/p - s/^# new file: */git_added_files+=\" \"/p + s/^# new file: /git_added_files+=\" \"/p s/^# renamed:[^>]*> /git_added_files+=\" \"/p + s/^# copied:[^>]*> /git_added_files+=\" \"/p } " ` |