Peter Arrenbrecht avatar Peter Arrenbrecht committed c4a62cb Merge

merge of stable

Comments (0)

Files changed (2)

.hgpatchinfo/bashcomp-meld.dep

+95265afff99fec598ef35fea7473f13319639c23

contrib/bash_completion

 	forget)
 	    _hg_status "a"
 	;;
-	diff)
+	diff|meld)
 	    _hg_status "mar"
 	;;
 	revert)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.