8000 git/mergetools/emerge at master · zrpeter/git · GitHub

Address: [go: up one dir, main page]

Include Form Remove Scripts Accept Cookies Show Images Show Referer Rotate13 Base64 Strip Meta Strip Title Session Cookies

Skip to content

Navigation Menu

All Features
- By Stage
  Enterprises
  Team
  Startups
  Nonprofits
- By Industry
  Healthcare
  Financial services
  Manufacturing
  Government
  See all industries
- Evaluate GitHub
  Why GitHub
  Customer Stories
  Business insights
  Trust Center
- Add-ons
  GitHub Advanced SecurityEnterprise-grade code security
  Copilot for businessEnterprise-grade AI features
  Premium SupportEnterprise-grade 24/7 support
- Learn & Connect
  Documentation
  Resource center
  Blog
  Events & webinars
  Community Forum
  Customer Stories
  Integrations
- Support
  Customer support
  Training
  GitHub Status
- Company
  About
  Partners
  Changelog
- GitHub Universe
  GitHub UniverseThe event for developers, by developers — talks, workshops, and what’s next for GitHub.
Pricing

Appearance settings

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

zrpeter
git

Repository navigation

Code
Pull requests
Actions
Projects
Security and quality
Insights

Breadcrumbs

git
mergetools

/

emerge

Copy path

More file actions

More file actions

Latest commit

History

History

26 lines (23 loc) · 438 Bytes

Breadcrumbs

git
mergetools

/

emerge

Copy path

File metadata and controls

26 lines (23 loc) · 438 Bytes

Copy raw file

Download raw file

Open symbols panel

Edit and raw actions

1

2

3

4

5

6

7

8

9

10

11

12

13

14

15

16

17

18

19

20

21

22

23

24

25

26

diff_cmd () {

"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"

}

merge_cmd () {

if $base_present

then

"$merge_tool_path" \

-f emerge-files-with-ancestor-command \

"$LOCAL" "$REMOTE" "$BASE" \

"$(basename "$MERGED")"

else

"$merge_tool_path" \

-f emerge-files-command \

"$LOCAL" "$REMOTE" \

"$(basename "$MERGED")"

fi

}

translate_merge_tool_path() {

echo emacs

}

exit_code_trustable () {

true

}

Footer

© 2026 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Community
Docs
Contact

You can’t perform that action at this time.

0