~mdw / stgit / blame
| Commit | Line | Data |
|---|---|---|
| 41a6d859 CM |
1 | [stgit] |
| 2 | # Default author/committer details | |
| 3 | #authname: Your Name | |
| 4 | #authemail: your.name@yourcompany.com | |
| 5 | #commname: Your Name | |
| 6 | #commemail: your.name@yourcompany.com | |
| 7 | ||
| 8 | # Set to 'yes' if you don't want to use the 'resolved' command. | |
| 9 | # 'refresh' will automatically mark the conflicts as resolved | |
| 10 | autoresolved: no | |
| 11 | ||
| b4bddc06 | 12 | smtpserver: localhost:25 |
| eb026d93 B |
13 | #smtpuser: username |
| 14 | #smtppassword: password | |
| b4bddc06 | 15 | |
| 41a6d859 CM |
16 | |
| 17 | [gitmergeonefile] | |
| 18 | # Different three-way merge tools below. Uncomment the preferred one. | |
| 19 | # Note that the 'output' file contains the same data as 'branch1'. This | |
| 20 | # is useful for tools that do not take an output parameter | |
| 21 | ||
| 22 | merger: diff3 -L local -L older -L remote -m -E \ | |
| 23 | "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s" | |
| 24 | ||
| 25 | #merger: xxdiff --title1 local --title2 older --title3 remote \ | |
| 26 | # --show-merged-pane -m -E -O -X -M "%(output)s" \ | |
| 27 | # "%(branch1)s" "%(ancestor)s" "%(branch2)s" | |
| 28 | ||
| 29 | #merger: emacs --eval '(ediff-merge-files-with-ancestor | |
| 30 | # "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")' | |
| 31 | ||
| 32 | # Leave the original files in the working tree in case of a merge conflict | |
| 33 | keeporig: yes |